1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/348ae95c02cc/ changeset: 348ae95c02cc user: james_taylor date: 2012-10-01 22:16:50 summary: removing webapp parameter from admin templates, fixing an import and some linting errors affected #: 14 files diff -r 2e0d02ea0aaf51301582671740c9281a1a8e15cf -r 348ae95c02cca1d6d1b446738631ecbcf76c810a lib/galaxy/web/base/controllers/admin.py --- a/lib/galaxy/web/base/controllers/admin.py +++ b/lib/galaxy/web/base/controllers/admin.py @@ -1,8 +1,10 @@ -from datetime import date, datetime, timedelta +from datetime import datetime, timedelta -from galaxy import config, tools, web, util +from galaxy import web, util from galaxy.model.orm import * +from galaxy.util import inflector + class Admin( object ): # Override these user_list_grid = None @@ -296,7 +298,6 @@ @web.expose @web.require_admin def mark_role_deleted( self, trans, **kwd ): - params = util.Params( kwd ) id = kwd.get( 'id', None ) if not id: message = "No role ids received for deleting" @@ -319,7 +320,6 @@ @web.expose @web.require_admin def undelete_role( self, trans, **kwd ): - params = util.Params( kwd ) id = kwd.get( 'id', None ) if not id: message = "No role ids received for undeleting" @@ -358,7 +358,6 @@ # - DefaultHistoryPermissions where role_id == Role.id # - GroupRoleAssociations where role_id == Role.id # - DatasetPermissionss where role_id == Role.id - params = util.Params( kwd ) id = kwd.get( 'id', None ) if not id: message = "No role ids received for purging" @@ -608,7 +607,6 @@ @web.expose @web.require_admin def undelete_group( self, trans, **kwd ): - params = util.Params( kwd ) id = kwd.get( 'id', None ) if not id: message = "No group ids received for undeleting" @@ -642,7 +640,6 @@ def purge_group( self, trans, **kwd ): # This method should only be called for a Group that has previously been deleted. # Purging a deleted Group simply deletes all UserGroupAssociations and GroupRoleAssociations. - params = util.Params( kwd ) id = kwd.get( 'id', None ) if not id: message = "No group ids received for purging" diff -r 2e0d02ea0aaf51301582671740c9281a1a8e15cf -r 348ae95c02cca1d6d1b446738631ecbcf76c810a templates/admin/dataset_security/group/group.mako --- a/templates/admin/dataset_security/group/group.mako +++ b/templates/admin/dataset_security/group/group.mako @@ -51,7 +51,6 @@ <div class="toolFormTitle">Group '${group.name}'</div><div class="toolFormBody"><form name="associate_group_role_user" id="associate_group_role_user" action="${h.url_for( action='manage_users_and_roles_for_group', id=trans.security.encode_id( group.id ) )}" method="post" > - <input name="webapp" type="hidden" value="${webapp}" size=40"/><div class="form-row"><div style="float: left; margin-right: 10px;"><label>Roles associated with '${group.name}'</label> diff -r 2e0d02ea0aaf51301582671740c9281a1a8e15cf -r 348ae95c02cca1d6d1b446738631ecbcf76c810a templates/admin/dataset_security/group/group_create.mako --- a/templates/admin/dataset_security/group/group_create.mako +++ b/templates/admin/dataset_security/group/group_create.mako @@ -57,7 +57,6 @@ <div class="toolFormBody"><form name="associate_group_role_user" id="associate_group_role_user" action="${h.url_for( action='create_group' )}" method="post" ><div class="form-row"> - <input name="webapp" type="hidden" value="${webapp}" size=40"/><label>Name:</label><input name="name" type="textfield" value="${name}" size=40"/></div> diff -r 2e0d02ea0aaf51301582671740c9281a1a8e15cf -r 348ae95c02cca1d6d1b446738631ecbcf76c810a templates/admin/dataset_security/group/group_rename.mako --- a/templates/admin/dataset_security/group/group_rename.mako +++ b/templates/admin/dataset_security/group/group_rename.mako @@ -10,7 +10,6 @@ <div class="toolFormBody"><form name="library" action="${h.url_for( controller='admin', action='rename_group' )}" method="post" ><div class="form-row"> - <input name="webapp" type="hidden" value="${webapp}" size=40"/><label>Name:</label><div style="float: left; width: 250px; margin-right: 10px;"><input type="text" name="name" value="${group.name}" size="40"/> diff -r 2e0d02ea0aaf51301582671740c9281a1a8e15cf -r 348ae95c02cca1d6d1b446738631ecbcf76c810a templates/admin/dataset_security/role/role.mako --- a/templates/admin/dataset_security/role/role.mako +++ b/templates/admin/dataset_security/role/role.mako @@ -51,7 +51,6 @@ <div class="toolFormTitle">Role '${role.name}'</div><div class="toolFormBody"><form name="associate_role_user_group" id="associate_role_user_group" action="${h.url_for( action='manage_users_and_groups_for_role', id=trans.security.encode_id( role.id ) )}" method="post" > - <input name="webapp" type="hidden" value="${webapp}" size=40"/><div class="form-row"><div style="float: left; margin-right: 10px;"><label>Users associated with '${role.name}'</label> diff -r 2e0d02ea0aaf51301582671740c9281a1a8e15cf -r 348ae95c02cca1d6d1b446738631ecbcf76c810a templates/admin/dataset_security/role/role_create.mako --- a/templates/admin/dataset_security/role/role_create.mako +++ b/templates/admin/dataset_security/role/role_create.mako @@ -57,7 +57,6 @@ <div class="toolFormBody"><form name="associate_role_group_user" id="associate_role_group_user" action="${h.url_for( action='create_role' )}" method="post" ><div class="form-row"> - <input name="webapp" type="hidden" value="${webapp}" size=40"/><label>Name:</label><input name="name" type="textfield" value="${name}" size=40"/></div> diff -r 2e0d02ea0aaf51301582671740c9281a1a8e15cf -r 348ae95c02cca1d6d1b446738631ecbcf76c810a templates/admin/dataset_security/role/role_rename.mako --- a/templates/admin/dataset_security/role/role_rename.mako +++ b/templates/admin/dataset_security/role/role_rename.mako @@ -10,7 +10,6 @@ <div class="toolFormBody"><form name="library" action="${h.url_for( controller='admin', action='rename_role' )}" method="post" ><div class="form-row"> - <input name="webapp" type="hidden" value="${webapp}" size=40"/><label>Name:</label><div style="float: left; width: 250px; margin-right: 10px;"><input type="text" name="name" value="${role.name}" size="40"/> diff -r 2e0d02ea0aaf51301582671740c9281a1a8e15cf -r 348ae95c02cca1d6d1b446738631ecbcf76c810a templates/admin/quota/quota.mako --- a/templates/admin/quota/quota.mako +++ b/templates/admin/quota/quota.mako @@ -51,7 +51,6 @@ <div class="toolFormTitle">Quota '${name}'</div><div class="toolFormBody"><form name="associate_quota_user_group" id="associate_quota_user_group" action="${h.url_for( action='manage_users_and_groups_for_quota', id=id )}" method="post" > - <input name="webapp" type="hidden" value="${webapp}" size=40"/><div class="form-row"><div style="float: left; margin-right: 10px;"><label>Users associated with '${name}'</label> diff -r 2e0d02ea0aaf51301582671740c9281a1a8e15cf -r 348ae95c02cca1d6d1b446738631ecbcf76c810a templates/admin/quota/quota_create.mako --- a/templates/admin/quota/quota_create.mako +++ b/templates/admin/quota/quota_create.mako @@ -66,7 +66,6 @@ <div class="toolFormBody"><form name="associate_quota_group_user" id="associate_quota_group_user" action="${h.url_for( action='create_quota' )}" method="post" ><div class="form-row"> - <input name="webapp" type="hidden" value="${webapp}" size=40"/><label>Name:</label><input name="name" type="textfield" value="${name}" size=40"/></div> diff -r 2e0d02ea0aaf51301582671740c9281a1a8e15cf -r 348ae95c02cca1d6d1b446738631ecbcf76c810a templates/admin/quota/quota_edit.mako --- a/templates/admin/quota/quota_edit.mako +++ b/templates/admin/quota/quota_edit.mako @@ -26,7 +26,6 @@ <div class="toolFormTitle">Change quota amount</div><div class="toolFormBody"><form name="library" action="${h.url_for( controller='admin', action='edit_quota' )}" method="post" > - <input name="webapp" type="hidden" value="${webapp}"/><input name="id" type="hidden" value="${id}"/><div class="form-row"><label>Amount</label> diff -r 2e0d02ea0aaf51301582671740c9281a1a8e15cf -r 348ae95c02cca1d6d1b446738631ecbcf76c810a templates/admin/quota/quota_rename.mako --- a/templates/admin/quota/quota_rename.mako +++ b/templates/admin/quota/quota_rename.mako @@ -19,7 +19,6 @@ <div class="toolFormBody"><form name="library" action="${h.url_for( controller='admin', action='rename_quota' )}" method="post" ><div class="form-row"> - <input name="webapp" type="hidden" value="${webapp}" size=40"/><label>Name:</label><div style="float: left; width: 250px; margin-right: 10px;"><input type="text" name="name" value="${name}" size="40"/> diff -r 2e0d02ea0aaf51301582671740c9281a1a8e15cf -r 348ae95c02cca1d6d1b446738631ecbcf76c810a templates/admin/quota/quota_set_default.mako --- a/templates/admin/quota/quota_set_default.mako +++ b/templates/admin/quota/quota_set_default.mako @@ -28,7 +28,6 @@ <div class="toolFormTitle">Set quota default</div><div class="toolFormBody"><form name="set_quota_default" id="set_quota_default" action="${h.url_for( action='set_quota_default' )}" method="post" > - <input name="webapp" type="hidden" value="${webapp}" size=40"/><input name="id" type="hidden" value="${id}"/><div class="form-row"><label>Is this quota a default for a class of users (if yes, what type)?</label> diff -r 2e0d02ea0aaf51301582671740c9281a1a8e15cf -r 348ae95c02cca1d6d1b446738631ecbcf76c810a templates/admin/user/reset_password.mako --- a/templates/admin/user/reset_password.mako +++ b/templates/admin/user/reset_password.mako @@ -9,7 +9,6 @@ <div class="toolFormTitle">Reset password for users</div><div class="toolFormBody"><form name="form" action="${h.url_for( controller='admin', action='reset_user_password' )}" method="post" > - <input name="webapp" type="hidden" value="${webapp}" size=40"/><input type="hidden" name="id" value="${id}" size="40"> %for user in users: <div class="form-row"> diff -r 2e0d02ea0aaf51301582671740c9281a1a8e15cf -r 348ae95c02cca1d6d1b446738631ecbcf76c810a templates/admin/user/user.mako --- a/templates/admin/user/user.mako +++ b/templates/admin/user/user.mako @@ -76,7 +76,6 @@ </div></div><div class="form-row"> - <input type="hidden" name="webapp" value="${webapp}"/><input type="submit" name="user_roles_groups_edit_button" value="Save"/></div></form> Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.