From 52014e69037e0e94b08ab49ed65f8c6a2c1e65d6 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Tue, 6 Oct 2015 11:06:09 +0200 Subject: SONAR-6854 use api/user_groups --- server/sonar-web/src/main/js/apps/groups/group.js | 2 +- server/sonar-web/src/main/js/apps/groups/groups.js | 2 +- server/sonar-web/src/main/js/apps/groups/users-view.js | 6 +++--- server/sonar-web/src/main/js/apps/users/groups-view.js | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'server/sonar-web/src/main/js/apps') diff --git a/server/sonar-web/src/main/js/apps/groups/group.js b/server/sonar-web/src/main/js/apps/groups/group.js index 89018901895..4fe63565365 100644 --- a/server/sonar-web/src/main/js/apps/groups/group.js +++ b/server/sonar-web/src/main/js/apps/groups/group.js @@ -3,7 +3,7 @@ import Backbone from 'backbone'; export default Backbone.Model.extend({ urlRoot: function () { - return baseUrl + '/api/usergroups'; + return baseUrl + '/api/user_groups'; }, sync: function (method, model, options) { diff --git a/server/sonar-web/src/main/js/apps/groups/groups.js b/server/sonar-web/src/main/js/apps/groups/groups.js index d22d3373d9a..d827872c7e8 100644 --- a/server/sonar-web/src/main/js/apps/groups/groups.js +++ b/server/sonar-web/src/main/js/apps/groups/groups.js @@ -5,7 +5,7 @@ export default Backbone.Collection.extend({ model: Group, url: function () { - return baseUrl + '/api/usergroups/search'; + return baseUrl + '/api/user_groups/search'; }, parse: function (r) { 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 8c815ff2e4d..fa8e632ef07 100644 --- a/server/sonar-web/src/main/js/apps/groups/users-view.js +++ b/server/sonar-web/src/main/js/apps/groups/users-view.js @@ -16,9 +16,9 @@ export default Modal.extend({ return item.name + '
' + item.login + ''; }, 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', + searchUrl: baseUrl + '/api/user_groups/users?ps=100&id=' + this.model.id, + selectUrl: baseUrl + '/api/user_groups/add_user', + deselectUrl: baseUrl + '/api/user_groups/remove_user', extra: { id: this.model.id }, 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 f402b931cb8..6e4a9048854 100644 --- 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,8 +18,8 @@ export default Modal.extend({ }, 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', + selectUrl: baseUrl + '/api/user_groups/add_user', + deselectUrl: baseUrl + '/api/user_groups/remove_user', extra: { login: this.model.id }, -- cgit v1.2.3