From c827bb0a867e2fcdf89417bb7ea912641e49cf8a Mon Sep 17 00:00:00 2001 From: guerler Date: Tue, 8 Aug 2017 09:59:17 -0400 Subject: [PATCH] Move unused mako templates to toolshed, adjust paths --- lib/tool_shed/util/admin_util.py | 6 +++--- .../tool_shed}/admin/dataset_security/group/group.mako | 0 .../admin/dataset_security/group/group_create.mako | 0 .../admin/dataset_security/group/group_rename.mako | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename templates/{ => webapps/tool_shed}/admin/dataset_security/group/group.mako (100%) rename templates/{ => webapps/tool_shed}/admin/dataset_security/group/group_create.mako (100%) rename templates/{ => webapps/tool_shed}/admin/dataset_security/group/group_rename.mako (100%) diff --git a/lib/tool_shed/util/admin_util.py b/lib/tool_shed/util/admin_util.py index 72ccd566539..a9abfadb487 100644 --- a/lib/tool_shed/util/admin_util.py +++ b/lib/tool_shed/util/admin_util.py @@ -441,7 +441,7 @@ class Admin( object ): action='groups', message=util.sanitize_text( message ), status='done' ) ) - return trans.fill_template( '/admin/dataset_security/group/group_rename.mako', + return trans.fill_template( '/webapps/tool_shed/admin/dataset_security/group/group_rename.mako', group=group, message=message, status=status ) @@ -482,7 +482,7 @@ class Admin( object ): else: out_users.append( ( user.id, user.email ) ) message += 'Group %s is currently associated with %d roles and %d users' % ( group.name, len( in_roles ), len( in_users ) ) - return trans.fill_template( '/admin/dataset_security/group/group.mako', + return trans.fill_template( '/webapps/tool_shed/admin/dataset_security/group/group.mako', group=group, in_roles=in_roles, out_roles=out_roles, @@ -555,7 +555,7 @@ class Admin( object ): .filter( trans.app.model.Role.table.c.deleted == false() ) \ .order_by( trans.app.model.Role.table.c.name ): out_roles.append( ( role.id, role.name ) ) - return trans.fill_template( '/admin/dataset_security/group/group_create.mako', + return trans.fill_template( '/webapps/tool_shed/admin/dataset_security/group/group_create.mako', name=name, in_users=in_users, out_users=out_users, diff --git a/templates/admin/dataset_security/group/group.mako b/templates/webapps/tool_shed/admin/dataset_security/group/group.mako similarity index 100% rename from templates/admin/dataset_security/group/group.mako rename to templates/webapps/tool_shed/admin/dataset_security/group/group.mako diff --git a/templates/admin/dataset_security/group/group_create.mako b/templates/webapps/tool_shed/admin/dataset_security/group/group_create.mako similarity index 100% rename from templates/admin/dataset_security/group/group_create.mako rename to templates/webapps/tool_shed/admin/dataset_security/group/group_create.mako diff --git a/templates/admin/dataset_security/group/group_rename.mako b/templates/webapps/tool_shed/admin/dataset_security/group/group_rename.mako similarity index 100% rename from templates/admin/dataset_security/group/group_rename.mako rename to templates/webapps/tool_shed/admin/dataset_security/group/group_rename.mako