Merge pull request ManageIQ#5374 from himdel/pagination-query-string

miqSelectPickerEvent - handle urls with non-empty query_string
borland667 · Nov 10, 2015 · 917ea40 · 917ea40
2 parents c75304b + 295b0e4
commit 917ea40
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/assets/javascripts/miq_application.js b/app/assets/javascripts/miq_application.js
@@ -1201,7 +1201,9 @@ function miqSelectPickerEvent(element, url, options){
     var selected = $('#' + element).val();
     options =  typeof options !== 'undefined' ? options : {}
     options['no_encoding'] = true;
-    miqJqueryRequest(url + '?' + element + '=' + escape(selected), options);
+
+    var firstarg = ! _.contains(url, '?');
+    miqJqueryRequest(url + (firstarg ? '?' : '&') + element + '=' + escape(selected), options);
     return true;
   });
 }