opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused api flag from repository installation controller

Browse Source
This commit is contained in:
guerler
2017-10-19 03:54:50 -04:00
parent 41eaf0a782
commit 9052c59275
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
+8 -13
View File
@@ -559,24 +559,17 @@ class AdminToolshed(AdminGalaxy):
@web.expose
@web.require_admin
def install_repositories(self, trans, **kwd):
api_installation = util.asbool(kwd.get('api', 'false'))
if api_installation:
tsr_ids = json.loads(kwd.get('tool_shed_repository_ids', '[]'))
kwd['tool_shed_repository_ids'] = tsr_ids
tsridslist = common_util.get_tool_shed_repository_ids(**kwd)
else:
tsridslist = common_util.get_tool_shed_repository_ids(**kwd)
if not tsridslist:
return self.message_exception(trans, 'Select at least 1 tool shed repository to %s.' % operation)
irm = install_manager.InstallRepositoryManager(trans.app)
reinstalling = util.string_as_bool(kwd.get('reinstalling', False))
encoded_kwd = kwd['encoded_kwd']
encoded_kwd = kwd.get('encoded_kwd')
decoded_kwd = encoding_util.tool_shed_decode(encoded_kwd)
install_resolver_dependencies = CheckboxField.is_checked(decoded_kwd.get('install_resolver_dependencies', ''))
install_tool_dependencies = CheckboxField.is_checked(decoded_kwd.get('install_tool_dependencies', ''))
tsr_ids = decoded_kwd['tool_shed_repository_ids']
decoded_kwd['install_resolver_dependencies'] = install_resolver_dependencies
decoded_kwd['install_tool_dependencies'] = install_tool_dependencies
tsr_ids = decoded_kwd.get('tool_shed_repository_ids')
if not tsr_ids:
return self.message_exception(trans, 'Repository ids missing.')
irm = install_manager.InstallRepositoryManager(trans.app)
try:
tool_shed_repositories = irm.install_repositories(
tsr_ids=tsr_ids,
@@ -794,7 +787,9 @@ class AdminToolshed(AdminGalaxy):
if not tsridslist:
tsridslist = repository_util.get_ids_of_tool_shed_repositories_being_installed(trans.app, as_string=False)
kwd['tool_shed_repository_ids'] = tsridslist
return self.repository_installation_grid(trans, **kwd)
return trans.fill_template('admin/tool_shed_repository/initiate_repository_installation.mako', tool_shed_repositories=tool_shed_repositories)
@web.json
@web.require_admin
templates/admin/tool_shed_repository/initiate_repository_installation.mako
+2 -2
View File
@@ -15,14 +15,14 @@
});
var initiate_repository_installation = function ( iri_ids, encoded_kwd, reinstalling ) {
// Make ajax call
$.ajax( {
iri_ids && $.ajax( {
type: "POST",
url: "${h.url_for( controller='admin_toolshed', action='install_repositories' )}",
dataType: "html",
data: { tool_shed_repository_ids: iri_ids, encoded_kwd: encoded_kwd, reinstalling: reinstalling },
success : function ( data ) {
console.log( "Initializing repository installation succeeded" );
},
}
});
};
</script>