Fix url parameter forwarding to grid view

This commit is contained in:
guerler
2017-08-01 12:31:22 -04:00
parent b3e095d66c
commit 1f27ad541d
10 changed files with 12 additions and 11 deletions
+1 -2
View File
@@ -22,8 +22,7 @@ window.app = function app( options, bootstrapped ){
},
show_users: function() {
window.console.log( $.param( Galaxy.params ) );
this.page.display( new GridView( { url_base: Galaxy.root + 'admin/users_list?' + $.param( Galaxy.params ), dict_format: true } ) );
this.page.display( new GridView( { url_base: Galaxy.root + 'admin/users_list', url_data: Galaxy.params, dict_format: true } ) );
}
});
+1 -1
View File
@@ -35,7 +35,7 @@ return Backbone.View.extend({
if ( this.dict_format ) {
this.setElement('<div/>');
if ( grid_config.url_base && !grid_config.items ) {
var url_data = {};
var url_data = grid_config.url_data || {};
_.each(grid_config.filters, function(v, k) {
url_data['f-' + k] = v;
});
@@ -1638,6 +1638,8 @@ class AdminGalaxy( controller.JSAppLauncher, AdminActions, UsesQuotaMixin, Quota
trans.sa_session.add( user )
trans.sa_session.flush()
if not message and not status:
message = "Passwords reset for %d %s." % ( len( user_ids ), util.inflector.cond_plural( len( user_ids ), 'user' ) )
status = "done"
trans.response.send_redirect( web.url_for( controller='admin',
action='users',
message=util.sanitize_text( message ),
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long