Skip to content

Commit

Permalink
Use inputs tag to indicate that the response is consistently for inpu…
Browse files Browse the repository at this point in the history
…t handling
  • Loading branch information
guerler committed Nov 17, 2016
1 parent 364f57d commit 51972a9
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 23 deletions.
12 changes: 6 additions & 6 deletions client/galaxy/scripts/mvc/user/user-preferences.js
Expand Up @@ -8,41 +8,41 @@ define( [ 'mvc/form/form-view', 'mvc/ui/ui-misc' ], function( Form, Ui ) {
'information': {
title : 'Manage information',
description : 'Edit your email, addresses and custom parameters or change your username.',
url : 'api/users/' + Galaxy.user.id + '/information',
url : 'api/users/' + Galaxy.user.id + '/information/inputs',
icon : 'fa-info-circle'
},
'password': {
title : 'Change password',
description : 'Allows you to change your login credentials.',
icon : 'fa-unlock-alt',
url : 'api/users/' + Galaxy.user.id + '/password',
url : 'api/users/' + Galaxy.user.id + '/password/inputs',
submit_title : 'Save password',
},
'communication': {
title : 'Change communication settings',
description : 'Enable or disable the communication feature to chat with other users.',
url : 'api/users/' + Galaxy.user.id + '/communication',
url : 'api/users/' + Galaxy.user.id + '/communication/inputs',
icon : 'fa-child'
},
'permissions': {
title : 'Change default permissions',
description : 'Grant others default access to newly created histories.',
url : 'api/users/' + Galaxy.user.id + '/permissions',
url : 'api/users/' + Galaxy.user.id + '/permissions/inputs',
icon : 'fa-users',
submit_title : 'Save permissions'
},
'api_key': {
title : 'Manage API key',
description : 'Access your current API key or create a new one.',
url : 'api/users/' + Galaxy.user.id + '/api_key',
url : 'api/users/' + Galaxy.user.id + '/api_key/inputs',
icon : 'fa-key',
submit_title : 'Create a new key',
submit_icon : 'fa-check'
},
'toolbox_filters': {
title : 'Manage Toolbox filters',
description : 'Customize your Toolbox by displaying or omitting sets of Tools.',
url : 'api/users/' + Galaxy.user.id + '/toolbox_filters',
url : 'api/users/' + Galaxy.user.id + '/toolbox_filters/inputs',
icon : 'fa-filter',
submit_title : 'Save filters'
},
Expand Down
24 changes: 12 additions & 12 deletions lib/galaxy/webapps/galaxy/buildapp.py
Expand Up @@ -459,18 +459,18 @@ def populate_api_routes( webapp, app ):
# ================================

webapp.mapper.connect( 'api_key', '/api/users/{id}/api_key', controller='users', action='api_key', conditions=dict( method=["POST"] ) )
webapp.mapper.connect( 'get_api_key', '/api/users/{id}/api_key', controller='users', action='api_key', conditions=dict( method=["GET"] ) )
webapp.mapper.connect( 'set_api_key', '/api/users/{id}/api_key', controller='users', action='api_key', conditions=dict( method=["PUT"] ) )
webapp.mapper.connect( 'get_information', '/api/users/{id}/information', controller='users', action='get_information', conditions=dict( method=["GET"] ) )
webapp.mapper.connect( 'set_information', '/api/users/{id}/information', controller='users', action='set_information', conditions=dict( method=["PUT"] ) )
webapp.mapper.connect( 'get_password', '/api/users/{id}/password', controller='users', action='get_password', conditions=dict( method=["GET"] ) )
webapp.mapper.connect( 'set_password', '/api/users/{id}/password', controller='users', action='set_password', conditions=dict( method=["PUT"] ) )
webapp.mapper.connect( 'get_permissions', '/api/users/{id}/permissions', controller='users', action='get_permissions', conditions=dict( method=["GET"] ) )
webapp.mapper.connect( 'set_permissions', '/api/users/{id}/permissions', controller='users', action='set_permissions', conditions=dict( method=["PUT"] ) )
webapp.mapper.connect( 'get_toolbox_filters', '/api/users/{id}/toolbox_filters', controller='users', action='get_toolbox_filters', conditions=dict( method=["GET"] ) )
webapp.mapper.connect( 'set_toolbox_filters', '/api/users/{id}/toolbox_filters', controller='users', action='set_toolbox_filters', conditions=dict( method=["PUT"] ) )
webapp.mapper.connect( 'get_communication', '/api/users/{id}/communication', controller='users', action='get_communication', conditions=dict( method=["GET"] ) )
webapp.mapper.connect( 'set_communication', '/api/users/{id}/communication', controller='users', action='set_communication', conditions=dict( method=["PUT"] ) )
webapp.mapper.connect( 'get_api_key', '/api/users/{id}/api_key/inputs', controller='users', action='api_key', conditions=dict( method=["GET"] ) )
webapp.mapper.connect( 'set_api_key', '/api/users/{id}/api_key/inputs', controller='users', action='api_key', conditions=dict( method=["PUT"] ) )
webapp.mapper.connect( 'get_information', '/api/users/{id}/information/inputs', controller='users', action='get_information', conditions=dict( method=["GET"] ) )
webapp.mapper.connect( 'set_information', '/api/users/{id}/information/inputs', controller='users', action='set_information', conditions=dict( method=["PUT"] ) )
webapp.mapper.connect( 'get_password', '/api/users/{id}/password/inputs', controller='users', action='get_password', conditions=dict( method=["GET"] ) )
webapp.mapper.connect( 'set_password', '/api/users/{id}/password/inputs', controller='users', action='set_password', conditions=dict( method=["PUT"] ) )
webapp.mapper.connect( 'get_permissions', '/api/users/{id}/permissions/inputs', controller='users', action='get_permissions', conditions=dict( method=["GET"] ) )
webapp.mapper.connect( 'set_permissions', '/api/users/{id}/permissions/inputs', controller='users', action='set_permissions', conditions=dict( method=["PUT"] ) )
webapp.mapper.connect( 'get_toolbox_filters', '/api/users/{id}/toolbox_filters/inputs', controller='users', action='get_toolbox_filters', conditions=dict( method=["GET"] ) )
webapp.mapper.connect( 'set_toolbox_filters', '/api/users/{id}/toolbox_filters/inputs', controller='users', action='set_toolbox_filters', conditions=dict( method=["PUT"] ) )
webapp.mapper.connect( 'get_communication', '/api/users/{id}/communication/inputs', controller='users', action='get_communication', conditions=dict( method=["GET"] ) )
webapp.mapper.connect( 'set_communication', '/api/users/{id}/communication/inputs', controller='users', action='set_communication', conditions=dict( method=["PUT"] ) )

# ========================
# ===== WEBHOOKS API =====
Expand Down
2 changes: 1 addition & 1 deletion static/maps/mvc/user/user-preferences.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions static/scripts/bundled/libs.bundled.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/scripts/bundled/libs.bundled.js.map

Large diffs are not rendered by default.

0 comments on commit 51972a9

Please sign in to comment.