Skip to content

Commit

Permalink
Remove repository_util dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
guerler committed Jul 20, 2017
1 parent 268186a commit 3cc6548
Showing 1 changed file with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions lib/tool_shed/util/admin_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
from galaxy import util, web
from galaxy.util import inflector
from galaxy.web.form_builder import CheckboxField
from tool_shed.util import repository_util
from tool_shed.util.web_util import escape

log = logging.getLogger( __name__ )
Expand Down Expand Up @@ -42,18 +41,9 @@ def index( self, trans, **kwd ):
def center( self, trans, **kwd ):
message = escape( kwd.get( 'message', '' ) )
status = kwd.get( 'status', 'done' )
if trans.webapp.name == 'galaxy':
is_repo_installed = trans.install_model.context.query( trans.install_model.ToolShedRepository ).first() is not None
installing_repository_ids = repository_util.get_ids_of_tool_shed_repositories_being_installed( trans.app, as_string=True )
return trans.fill_template( '/webapps/galaxy/admin/center.mako',
is_repo_installed=is_repo_installed,
installing_repository_ids=installing_repository_ids,
message=message,
status=status )
else:
return trans.fill_template( '/webapps/tool_shed/admin/center.mako',
message=message,
status=status )
return trans.fill_template( '/webapps/tool_shed/admin/center.mako',
message=message,
status=status )

@web.expose
@web.require_admin
Expand Down

0 comments on commit 3cc6548

Please sign in to comment.