From ab50432ead5d0ec74cf07c24b501880863ef2689 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 26 Jun 2014 15:45:31 -0700 Subject: [PATCH] use underscorejs templating for queued assignments --- domain-server/resources/web/index.shtml | 9 +++++++++ domain-server/resources/web/js/tables.js | 13 ++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/domain-server/resources/web/index.shtml b/domain-server/resources/web/index.shtml index 9d5ee93857..f0315a113f 100644 --- a/domain-server/resources/web/index.shtml +++ b/domain-server/resources/web/index.shtml @@ -44,6 +44,15 @@ + diff --git a/domain-server/resources/web/js/tables.js b/domain-server/resources/web/js/tables.js index 28e54b3773..0b29d4e6c9 100644 --- a/domain-server/resources/web/js/tables.js +++ b/domain-server/resources/web/js/tables.js @@ -1,6 +1,7 @@ $(document).ready(function(){ // setup the underscore templates var nodeTemplate = _.template($('#nodes-template').html()); + var queuedTemplate = _.template($('#queued-template').html()); // setup a function to grab the assignments function getNodesAndAssignments() { @@ -36,17 +37,7 @@ $(document).ready(function(){ }); $.getJSON("assignments.json", function(json){ - queuedTableBody = ""; - - $.each(json.queued, function (uuid, data) { - queuedTableBody += ""; - queuedTableBody += "" + data.type + ""; - queuedTableBody += "" + uuid + ""; - queuedTableBody += "" + (data.pool ? data.pool : "") + ""; - queuedTableBody += ""; - }); - - $('#assignments-table tbody').html(queuedTableBody); + $('#assignments-table tbody').html(queuedTemplate(json)); }); }