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

Add client side form to create new quota

Browse Source
This commit is contained in:
guerler
2017-08-09 12:04:44 -04:00
parent 9f580d0630
commit 0f84d8bd91
5 changed files with 66 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/apps/admin.js
+17 -12
View File
@@ -49,57 +49,62 @@ window.app = function app( options, bootstrapped ){
},
show_forms : function( form_id ) {
var id = '?id=' + QueryStringParsing.get( 'id' );
var form_defs = {
reset_user_password: {
title : 'Reset passwords',
url : 'admin/reset_user_password?id=' + QueryStringParsing.get( 'id' ),
url : 'admin/reset_user_password' + id,
icon : 'fa-user',
submit_title : 'Save new password',
redirect : 'admin/users'
},
manage_roles_and_groups_for_user: {
url : 'admin/manage_roles_and_groups_for_user?id=' + QueryStringParsing.get( 'id' ),
url : 'admin/manage_roles_and_groups_for_user' + id,
icon : 'fa-users',
redirect : 'admin/users'
},
manage_users_and_groups_for_role: {
url : 'admin/manage_users_and_groups_for_role?id=' + QueryStringParsing.get( 'id' ),
url : 'admin/manage_users_and_groups_for_role' + id,
redirect : 'admin/roles'
},
manage_users_and_roles_for_group: {
url : 'admin/manage_users_and_roles_for_group?id=' + QueryStringParsing.get( 'id' ),
url : 'admin/manage_users_and_roles_for_group' + id,
redirect : 'admin/groups'
},
manage_users_and_groups_for_quota: {
url : 'admin/manage_users_and_groups_for_quota?id=' + QueryStringParsing.get( 'id' ),
url : 'admin/manage_users_and_groups_for_quota' + id,
redirect : 'admin/quotas'
},
create_role: {
url : 'admin/create_role?id=' + QueryStringParsing.get( 'id' ),
url : 'admin/create_role',
redirect : 'admin/roles'
},
create_group: {
url : 'admin/create_group?id=' + QueryStringParsing.get( 'id' ),
url : 'admin/create_group',
redirect : 'admin/groups'
},
create_quota: {
url : 'admin/create_quota',
redirect : 'admin/quotas'
},
rename_role: {
url : 'admin/rename_role?id=' + QueryStringParsing.get( 'id' ),
url : 'admin/rename_role' + id,
redirect : 'admin/roles'
},
rename_group: {
url : 'admin/rename_group?id=' + QueryStringParsing.get( 'id' ),
url : 'admin/rename_group' + id,
redirect : 'admin/groups'
},
rename_quota: {
url : 'admin/rename_quota?id=' + QueryStringParsing.get( 'id' ),
url : 'admin/rename_quota' + id,
redirect : 'admin/quotas'
},
edit_quota: {
url : 'admin/edit_quota?id=' + QueryStringParsing.get( 'id' ),
url : 'admin/edit_quota' + id,
redirect : 'admin/quotas'
},
set_quota_default: {
url : 'admin/set_quota_default?id=' + QueryStringParsing.get( 'id' ),
url : 'admin/set_quota_default' + id,
redirect : 'admin/quotas'
},
};
lib/galaxy/webapps/galaxy/controllers/admin.py
+45 -45
View File
@@ -387,7 +387,7 @@ class QuotaListGrid( grids.Grid ):
visible=False,
filterable="standard" ) )
global_actions = [
grids.GridAction( "Add new quota", dict( controller='admin', action='quotas', operation='create' ) )
grids.GridAction( "Add new quota", dict( action='forms/create_quota' ) )
]
operations = [ grids.GridOperation( "Rename",
condition=( lambda item: not item.deleted ),
@@ -575,52 +575,52 @@ class AdminGalaxy( controller.JSAppLauncher, AdminActions, UsesQuotaMixin, Quota
kwargs[ 'dict_format' ] = True
return self.quota_list_grid( trans, **kwargs )
@web.expose
@web.expose_api
@web.require_admin
def create_quota( self, trans, **kwd ):
params = self.get_quota_params( kwd )
if params.get( 'create_quota_button', False ):
def create_quota( self, trans, payload=None, **kwd ):
if trans.request.method == 'GET':
all_users = []
all_groups = []
for user in trans.sa_session.query( trans.app.model.User ) \
.filter( trans.app.model.User.table.c.deleted == false() ) \
.order_by( trans.app.model.User.table.c.email ):
all_users.append( ( user.email, trans.security.encode_id( user.id ) ) )
for group in trans.sa_session.query( trans.app.model.Group ) \
.filter( trans.app.model.Group.table.c.deleted == false() ) \
.order_by( trans.app.model.Group.table.c.name ):
all_groups.append( ( group.name, trans.security.encode_id( group.id ) ) )
default_options = [ ( 'No', 'no' ) ]
for typ in trans.app.model.DefaultQuotaAssociation.types.__dict__.values():
default_options.append( ( 'Yes, ' + typ, typ ) )
return { 'title' : 'Create Quota',
'inputs' : [{
'name' : 'name',
'label' : 'Name'
},{
'name' : 'description',
'label' : 'Description'
},{
'name' : 'amount',
'label' : 'Amount',
'help' : 'Examples: "10000MB", "99 gb", "0.2T", "unlimited"'
},{
'name' : 'operation',
'label' : 'Assign, increase by amount, or decrease by amount?',
'options' : [ ('=', '=' ), ( '+', '+' ), ( '-', '-' ) ]
},{
'name' : 'default',
'label' : 'Assign, increase by amount, or decrease by amount?',
'options' : default_options,
'help' : 'Warning: Any users or groups associated with this quota will be disassociated.'
},
build_select_input( 'in_groups', 'Groups', all_groups, [] ),
build_select_input( 'in_users', 'Users', all_users, [] ) ] }
else:
try:
quota, message = self._create_quota( params )
return trans.response.send_redirect( web.url_for( controller='admin',
action='quotas',
webapp=params.webapp,
message=sanitize_text( message ),
status='done' ) )
except MessageException as e:
params.message = str( e )
params.status = 'error'
in_users = map( int, params.in_users )
in_groups = map( int, params.in_groups )
new_in_users = []
new_in_groups = []
for user in trans.sa_session.query( trans.app.model.User ) \
.filter( trans.app.model.User.table.c.deleted == expression.false() ) \
.order_by( trans.app.model.User.table.c.email ):
if user.id in in_users:
new_in_users.append( ( user.id, user.email ) )
else:
params.out_users.append( ( user.id, user.email ) )
for group in trans.sa_session.query( trans.app.model.Group ) \
.filter( trans.app.model.Group.table.c.deleted == expression.false() ) \
.order_by( trans.app.model.Group.table.c.name ):
if group.id in in_groups:
new_in_groups.append( ( group.id, group.name ) )
else:
params.out_groups.append( ( group.id, group.name ) )
return trans.fill_template( '/admin/quota/quota_create.mako',
webapp=params.webapp,
name=params.name,
description=params.description,
amount=params.amount,
operation=params.operation,
default=params.default,
in_users=new_in_users,
out_users=params.out_users,
in_groups=new_in_groups,
out_groups=params.out_groups,
message=params.message,
status=params.status )
quota, message = self._create_quota( util.Params( payload ) )
return { 'message': message }
except ActionInputError as e:
return message_exception( trans, e.err_msg )
@web.expose_api
@web.require_admin
static/scripts/bundled/admin.bundled.js
+2 -2
View File
File diff suppressed because one or more lines are too long
static/scripts/bundled/admin.bundled.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/bundled/libs.bundled.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long