opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 12:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Catch user input error for auto created roles and groups

Browse Source
This commit is contained in:
guerler
2017-08-15 16:26:25 -04:00
parent 246489a7aa
commit f9e8892150
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/controllers/admin.py
+6
View File
@@ -1000,6 +1000,9 @@ class AdminGalaxy( controller.JSAppLauncher, AdminActions, UsesQuotaMixin, Quota
gra = trans.app.model.GroupRoleAssociation( group, role )
trans.sa_session.add( gra )
if auto_create_checked:
# Check if role with same name already exists
if trans.sa_session.query( trans.app.model.Group ).filter( trans.app.model.Group.table.c.name == name ).first():
return message_exception( trans, 'A group with that name already exists, so choose another name or disable group creation.' )
# Create the group
group = trans.app.model.Group( name=name )
trans.sa_session.add( group )
@@ -1305,6 +1308,9 @@ class AdminGalaxy( controller.JSAppLauncher, AdminActions, UsesQuotaMixin, Quota
gra = trans.app.model.GroupRoleAssociation( group, role )
trans.sa_session.add( gra )
if auto_create_checked:
# Check if role with same name already exists
if trans.sa_session.query( trans.app.model.Role ).filter( trans.app.model.Role.table.c.name == name ).first():
return message_exception( trans, 'A role with that name already exists, so choose another name or disable role creation.' )
# Create the role
role = trans.app.model.Role( name=name, description='Role for group %s' % name )
trans.sa_session.add( role )