Skip to content

Commit

Permalink
Mostly fixed repository dependency jstree.
Browse files Browse the repository at this point in the history
  • Loading branch information
@davebx
davebx committed Feb 21, 2017
1 parent 68a51ac commit 5dc9728
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 25 deletions.
6 changes: 4 additions & 2 deletions client/galaxy/scripts/mvc/toolshed/repository-queue-view.js
View file
Expand Up @@ -39,13 +39,15 @@ define(['mvc/toolshed/toolshed-model', 'mvc/toolshed/util'], function(toolshed_m
}
localStorage.repositories = JSON.stringify(repo_queue);
});
$('#clear_queue').on('click', function() {
localStorage.repositories = "{}";
});
$('#from_workflow').on('click', function() { Backbone.history.navigate('workflows', {trigger: true, replace:true}); });
},

installFromQueue: function(repository_metadata, queue_key) {
var that = this;
var params = Object();
console.log(repository_metadata);
params.install_tool_dependencies = repository_metadata.install_tool_dependencies;
params.install_repository_dependencies = repository_metadata.install_repository_dependencies;
params.install_resolver_dependencies = repository_metadata.install_resolver_dependencies;
Expand Down Expand Up @@ -107,7 +109,7 @@ define(['mvc/toolshed/toolshed-model', 'mvc/toolshed/util'], function(toolshed_m
'<th class="datasetRow">Owner</th>',
'<th class="datasetRow">Revision</th>',
'<th class="datasetRow">ToolShed</th>',
'<th class="datasetRow"><input class="btn btn-primary" type="submit" id="install_all" name="install_all" value="Install all" /></th>',
'<th class="datasetRow">Install</th>',
'<th class="datasetRow"><input class="btn btn-primary" type="submit" id="clear_queue" name="clear_queue" value="Clear queue" /></th>',
'</tr>',
'</thead>',
Expand Down
37 changes: 19 additions & 18 deletions client/galaxy/scripts/mvc/toolshed/repository-view.js
View file
Expand Up @@ -116,7 +116,7 @@ define(['mvc/toolshed/toolshed-model',
$(this).removeAttr('default');
}
});
$('#repository_dependencies').jstree();
$(function() { $('#repository_dependencies').jstree(); });
$('.tool_form').on('click', function() {
var guid = $(this).attr('data-guid');
var clean = $(this).attr('data-clean');
Expand Down Expand Up @@ -378,30 +378,31 @@ define(['mvc/toolshed/toolshed-model',

templateRepoDependencies: _.template([
'<div class="toolFormTitle">Repository Dependencies</div>',
'<div class="toolFormBody tables container-table" id="repository_dependencies_table">',
'<span class="repository_dependency_row"><p>Repository installation requires the following:</p></span>',
'<ul id="repository_dependencies">',
'<% if (has_repository_dependencies) { %>',
'<% _.each(repository_dependencies, function(dependency) { %>',
'<% dependency.repository_dependency_template = repository_dependency_template; %>',
'<%= repository_dependency_template(dependency) %>',
'<% }); %>',
'<% } %>',
'<div class="toolFormBody tables container-table" id="repository_dependencies">',
'<ul>',
'<li>Repository installation requires the following',
'<% if (has_repository_dependencies) { %>',
'<% _.each(repository_dependencies, function(dependency) { %>',
'<% dependency.repository_dependency_template = repository_dependency_template; %>',
'<%= repository_dependency_template(dependency) %>',
'<% }); %>',
'<% } %>',
'</li>',
'</ul>',
'</div>'].join('')),

templateRepoDependency: _.template([
'<li id="metadata_<%= id %>" class="datasetRow repository_dependency_row" style="display: table-row;">',
'Repository <b><%= repository.name %></b> revision <b><%= changeset_revision %></b> owned by <b><%= repository.owner %></b>',
'<% if (has_repository_dependencies) { %>',
'<ul class="child_dependencies">',
'<% _.each(repository_dependencies, function(dependency) { %>',
'<% dependency.repository_dependency_template = repository_dependency_template; %>',
'<%= repository_dependency_template(dependency) %>',
'<% }); %>',
'</ul>',
'<% } %>',
'</li>',
'<% if (has_repository_dependencies) { %>',
'<ul class="child_dependencies">',
'<% _.each(repository_dependencies, function(dependency) { %>',
'<% dependency.repository_dependency_template = repository_dependency_template; %>',
'<%= repository_dependency_template(dependency) %>',
'<% }); %>',
'</ul>',
'<% } %>'
].join('')),

templateShedToolConf: _.template([
Expand Down
6 changes: 4 additions & 2 deletions static/scripts/mvc/toolshed/repository-queue-view.js
View file
Expand Up @@ -27,6 +27,8 @@ define([ "mvc/toolshed/toolshed-model", "mvc/toolshed/util" ], function(toolshed
delete repo_queue[queue_key], $("#queued_repository_" + repository_id).remove();
}
localStorage.repositories = JSON.stringify(repo_queue);
}), $("#clear_queue").on("click", function() {
localStorage.repositories = "{}";
}), $("#from_workflow").on("click", function() {
Backbone.history.navigate("workflows", {
trigger: !0,
Expand All @@ -36,7 +38,7 @@ define([ "mvc/toolshed/toolshed-model", "mvc/toolshed/util" ], function(toolshed
},
installFromQueue: function(repository_metadata, queue_key) {
var params = Object();
console.log(repository_metadata), params.install_tool_dependencies = repository_metadata.install_tool_dependencies,
params.install_tool_dependencies = repository_metadata.install_tool_dependencies,
params.install_repository_dependencies = repository_metadata.install_repository_dependencies,
params.install_resolver_dependencies = repository_metadata.install_resolver_dependencies,
params.tool_panel_section = repository_metadata.tool_panel_section, params.shed_tool_conf = repository_metadata.shed_tool_conf,
Expand All @@ -62,7 +64,7 @@ define([ "mvc/toolshed/toolshed-model", "mvc/toolshed/util" ], function(toolshed
reDraw: function(options) {
this.$el.empty(), this.initialize(options), this.model.fetch(), this.render(options);
},
templateRepoQueue: _.template([ '<div class="unified-panel-header" id="panel_header" unselectable="on">', '<div class="unified-panel-header-inner"><%= title %></div>', '<div class="unified-panel-header-inner" style="position: absolute; right: 5px; top: 0px;"><a href="#/queue">Repository Queue (<%= queue %>)</a></div>', "</div>", '<div class="tab-pane" id="panel_header" id="repository_queue">', '<table id="queued_repositories" class="grid" border="0" cellpadding="2" cellspacing="2" width="100%">', '<thead id="grid-table-header">', "<tr>", '<th class="datasetRow">Name</th>', '<th class="datasetRow">Owner</th>', '<th class="datasetRow">Revision</th>', '<th class="datasetRow">ToolShed</th>', '<th class="datasetRow"><input class="btn btn-primary" type="submit" id="install_all" name="install_all" value="Install all" /></th>', '<th class="datasetRow"><input class="btn btn-primary" type="submit" id="clear_queue" name="clear_queue" value="Clear queue" /></th>', "</tr>", "</thead>", "<tbody>", "<% _.each(repositories, function(repository) { %>", '<tr id="queued_repository_<%= repository.get("id") %>">', '<td class="datasetRow"><%= repository.get("repository").name %></td>', '<td class="datasetRow"><%= repository.get("repository").owner %></td>', '<td class="datasetRow"><%= repository.get("changeset_revision") %></td>', '<td class="datasetRow"><%= repository.get("tool_shed_url") %></td>', '<td class="datasetRow">', '<input class="btn btn-primary install_one" data-repokey="<%= repository.get("queue_key") %>" type="submit" id="install_repository_<%= repository.get("id") %>" name="install_repository" value="Install now" />', "</td>", '<td class="datasetRow">', '<input class="btn btn-primary remove_one" data-repokey="<%= repository.get("queue_key") %>" type="submit" id="unqueue_repository_<%= repository.get("id") %>" name="unqueue_repository" value="Remove from queue" />', "</td>", "</tr>", "<% }); %>", "</tbody>", "</table>", '<input type="button" class="btn btn-primary" id="from_workflow" value="Add from workflow" />', "</div>" ].join(""))
templateRepoQueue: _.template([ '<div class="unified-panel-header" id="panel_header" unselectable="on">', '<div class="unified-panel-header-inner"><%= title %></div>', '<div class="unified-panel-header-inner" style="position: absolute; right: 5px; top: 0px;"><a href="#/queue">Repository Queue (<%= queue %>)</a></div>', "</div>", '<div class="tab-pane" id="panel_header" id="repository_queue">', '<table id="queued_repositories" class="grid" border="0" cellpadding="2" cellspacing="2" width="100%">', '<thead id="grid-table-header">', "<tr>", '<th class="datasetRow">Name</th>', '<th class="datasetRow">Owner</th>', '<th class="datasetRow">Revision</th>', '<th class="datasetRow">ToolShed</th>', '<th class="datasetRow">Install</th>', '<th class="datasetRow"><input class="btn btn-primary" type="submit" id="clear_queue" name="clear_queue" value="Clear queue" /></th>', "</tr>", "</thead>", "<tbody>", "<% _.each(repositories, function(repository) { %>", '<tr id="queued_repository_<%= repository.get("id") %>">', '<td class="datasetRow"><%= repository.get("repository").name %></td>', '<td class="datasetRow"><%= repository.get("repository").owner %></td>', '<td class="datasetRow"><%= repository.get("changeset_revision") %></td>', '<td class="datasetRow"><%= repository.get("tool_shed_url") %></td>', '<td class="datasetRow">', '<input class="btn btn-primary install_one" data-repokey="<%= repository.get("queue_key") %>" type="submit" id="install_repository_<%= repository.get("id") %>" name="install_repository" value="Install now" />', "</td>", '<td class="datasetRow">', '<input class="btn btn-primary remove_one" data-repokey="<%= repository.get("queue_key") %>" type="submit" id="unqueue_repository_<%= repository.get("id") %>" name="unqueue_repository" value="Remove from queue" />', "</td>", "</tr>", "<% }); %>", "</tbody>", "</table>", '<input type="button" class="btn btn-primary" id="from_workflow" value="Add from workflow" />', "</div>" ].join(""))
});
return {
RepoQueueView: View
Expand Down

0 comments on commit 5dc9728

Please sign in to comment.