Update the display of workflows missing tools.

Thus accomodating the API changes made in the previous commit.
galaxyproject · Aug 25, 2016 · 57c01f1 · 57c01f1
1 parent 73cdfc7
commit 57c01f1
Showing 1 changed file with 21 additions and 8 deletions.
diff --git a/templates/admin/tool_shed_repository/browse_toolsheds.mako b/templates/admin/tool_shed_repository/browse_toolsheds.mako
@@ -29,7 +29,7 @@ div.container {
 ul.jstree-container-ul {
     margin-top: 1em;
 }
-ul.workflow_tools {
+ul.workflow_tools, ul.workflow_names {
     padding-left: 0px;
     list-style-type: none
 }
@@ -60,28 +60,41 @@ workflows_missing_tools = _.template([
     '<table id="workflows_missing_tools" class="grid" border="0" cellpadding="2" cellspacing="2" width="100%">',
         '<thead id="grid-table-header">',
             '<tr>',
+                '<th class="datasetRow">Workflows</th>',
+                '<th class="datasetRow">Tool IDs</th>',
+                '<th class="datasetRow">Shed</th>',
                 '<th class="datasetRow">Name</th>',
                 '<th class="datasetRow">Owner</th>',
-                '<th class="datasetRow">Tool IDs</th>',
                 '<th class="datasetRow">Actions</th>',
             '</tr>',
         '</thead>',
         '<tbody>',
-            '<\% _.each(workflows, function(workflow) { \%>',
+            '<\% _.each(Object.keys(workflows), function(workflow_key) { \%>',
+                '<\% console.log(workflow_key); \%>',
+                '<\% var workflow_details = workflow_key.split("/"); \%>',
+                '<\% var workflow = workflows[workflow_key]; \%>',
                 '<tr>',
-                    '<td class="datasetRow"><\%= workflow.name \%></td>',
-                    '<td class="datasetRow"><\%= workflow.owner \%></td>',
+                    '<td class="datasetRow">',
+                        '<ul class="workflow_names">',
+                            '<\% _.each(workflow.workflows.sort(), function(wf) { \%>',
+                                '<li class="workflow_names"><\%= wf \%></li>',
+                            '<\% }); \%>',
+                        '</ul>',
+                    '</td>',
                     '<td class="datasetRow">',
                         '<ul class="workflow_tools">',
-                            '<\% _.each(workflow.missing_tools, function(tool) { \%>',
+                            '<\% _.each(workflow.tools.sort(), function(tool) { \%>',
                                 '<li class="workflow_tools"><\%= tool \%></li>',
                             '<\% }); \%>',
                         '</ul>',
                     '</td>',
+                    '<td class="datasetRow"><\%= workflow_details[0] \%></td>',
+                    '<td class="datasetRow"><\%= workflow_details[2] \%></td>',
+                    '<td class="datasetRow"><\%= workflow_details[1] \%></td>',
                     '<td class="datasetRow">',
                         '<ul class="workflow_tools">',
-                            '<li class="workflow_tools"><input type="button" class="show_wf_repo btn btn-primary" data-toolids="<\%= workflow.missing_tools.join(\'|\') \%>" value="Preview" /></li>',
-                            '<li><input type="button" class="queue_wf_repo btn btn-primary" data-toolids="<\%= workflow.missing_tools.join(\'|\') \%>" value="Add to queue" /></li>',
+                            '<li class="workflow_tools"><input type="button" class="show_wf_repo btn btn-primary" data-shed="<\%= workflow_details[0] \%>" data-owner="<\%= workflow_details[1] \%>" data-repo="<\%= workflow_details[2] \%>" data-sampleguid="<\%= workflow.tools[0] \%>" value="Preview" /></li>',
+                            '<li><input type="button" class="queue_wf_repo btn btn-primary" data-shed="<\%= workflow_details[0] \%>" data-owner="<\%= workflow_details[1] \%>" data-repo="<\%= workflow_details[2] \%>" data-sampleguid="<\%= workflow.tools[0] \%>" value="Add to queue" /></li>',
                         '</ul>',
                     '</td>',
                 '</tr>',