SONAR-6602 use "q" for search

diff --git a/server/sonar-web/src/main/js/apps/groups/users-view.js b/server/sonar-web/src/main/js/apps/groups/users-view.js
index 59f84d74b085bd8e1f9fcc3678d14cf3cd441e4b..cfe6468ce0e0b3996213a18395e6323036481400 100644 (file)
--- a/server/sonar-web/src/main/js/apps/groups/users-view.js
+++ b/server/sonar-web/src/main/js/apps/groups/users-view.js
@@ -17,6 +17,7 @@ define([
         format: function (item) {
           return item.name + '<br><span class="note">' + item.login + '</span>';
         },
+        queryParam: 'q',
         searchUrl: baseUrl + '/api/usergroups/users?ps=100&id=' + this.model.id,
         selectUrl: baseUrl + '/api/usergroups/add_user',
         deselectUrl: baseUrl + '/api/usergroups/remove_user',

diff --git a/server/sonar-web/src/main/js/apps/users/groups-view.js b/server/sonar-web/src/main/js/apps/users/groups-view.js
index cf5f5da9eb6542d826c5fcc7dbe33b71758b8ff0..1634fb1d244d07f20f0aa3669194c79fa55e5566 100644 (file)
--- a/server/sonar-web/src/main/js/apps/users/groups-view.js
+++ b/server/sonar-web/src/main/js/apps/users/groups-view.js
@@ -18,6 +18,7 @@ define([
         format: function (item) {
           return item.name + '<br><span class="note">' + item.description + '</span>';
         },
+        queryParam: 'q',
         searchUrl: baseUrl + '/api/users/groups?ps=100&login=' + this.model.id,
         selectUrl: baseUrl + '/api/usergroups/add_user',
         deselectUrl: baseUrl + '/api/usergroups/remove_user',

diff --git a/server/sonar-web/src/main/js/components/common/select-list.js b/server/sonar-web/src/main/js/components/common/select-list.js
index 480fbd9d69059df2a64e780ead8e235e0fd32243..5716ed2fa10cf748c3ef1f0dc5db361fc2dfd231 100644 (file)
--- a/server/sonar-web/src/main/js/components/common/select-list.js
+++ b/server/sonar-web/src/main/js/components/common/select-list.js
@@ -329,7 +329,8 @@ define(function () {
     search: function () {
       var query = this.$('.select-list-search-control input').val(),
           hasQuery = query.length > 0,
-          that = this;
+          that = this,
+          data = {};
 
       this.$('.select-list-check-control').toggleClass('disabled', hasQuery);
       this.$('.select-list-search-control').toggleClass('disabled', !hasQuery);
@@ -338,10 +339,11 @@ define(function () {
         this.showFetchSpinner();
         this.currentFilter = 'all';
 
+        data[this.settings.queryParam] = query;
         this.collection.fetch({
           url: this.settings.searchUrl,
           reset: true,
-          data: { query: query },
+          data: data,
           success: function () {
             that.hideFetchSpinner();
           },
@@ -431,6 +433,8 @@ define(function () {
       return r.results;
     },
 
+    queryParam: 'query',
+
     labels: {
       selected: 'Selected',
       deselected: 'Deselected',