diff options
Diffstat (limited to 'server/sonar-web/src')
5 files changed, 19 insertions, 11 deletions
diff --git a/server/sonar-web/src/main/js/apps/drilldown/app.js b/server/sonar-web/src/main/js/apps/drilldown/app.js index b2f9cca9940..95d61812d0d 100644 --- a/server/sonar-web/src/main/js/apps/drilldown/app.js +++ b/server/sonar-web/src/main/js/apps/drilldown/app.js @@ -5,7 +5,7 @@ define([ var $ = jQuery, App = new Marionette.Application(), - init = function (options) { + init = function () { App.addRegions({ viewerRegion: '#source-viewer' }); $('.js-drilldown-link').on('click', function (e) { e.preventDefault(); @@ -23,8 +23,8 @@ define([ }); }; - App.on('start', function (options) { - init.call(App, options); + App.on('start', function () { + init.call(App); }); return App; diff --git a/server/sonar-web/src/main/js/apps/project-permissions/groups-view.js b/server/sonar-web/src/main/js/apps/project-permissions/groups-view.js index 5f1ee7bb807..6cb593c3e9f 100644 --- a/server/sonar-web/src/main/js/apps/project-permissions/groups-view.js +++ b/server/sonar-web/src/main/js/apps/project-permissions/groups-view.js @@ -4,6 +4,10 @@ define([ './templates' ], function (Modal) { + function getSearchUrl(permission, project) { + return baseUrl + '/api/permissions/groups?ps=100&permission=' + permission + '&projectId=' + project; + } + return Modal.extend({ template: Templates['project-permissions-groups'], @@ -18,7 +22,7 @@ define([ return item.name; }, queryParam: 'q', - searchUrl: baseUrl + '/api/permissions/groups?ps=100&permission=' + this.options.permission + '&projectId=' + this.options.project, + searchUrl: getSearchUrl(this.options.permission, this.options.project), selectUrl: baseUrl + '/api/permissions/add_group', deselectUrl: baseUrl + '/api/permissions/remove_group', extra: { @@ -44,7 +48,7 @@ define([ serializeData: function () { return _.extend(Modal.prototype.serializeData.apply(this, arguments), { projectName: this.options.projectName - }) + }); } }); diff --git a/server/sonar-web/src/main/js/apps/project-permissions/users-view.js b/server/sonar-web/src/main/js/apps/project-permissions/users-view.js index 316c4508d00..9da1eb9025d 100644 --- a/server/sonar-web/src/main/js/apps/project-permissions/users-view.js +++ b/server/sonar-web/src/main/js/apps/project-permissions/users-view.js @@ -4,6 +4,10 @@ define([ './templates' ], function (Modal) { + function getSearchUrl(permission, project) { + return baseUrl + '/api/permissions/users?ps=100&permission=' + permission + '&projectId=' + project; + } + return Modal.extend({ template: Templates['project-permissions-users'], @@ -18,7 +22,7 @@ define([ return item.name + '<br><span class="note">' + item.login + '</span>'; }, queryParam: 'q', - searchUrl: baseUrl + '/api/permissions/users?ps=100&permission=' + this.options.permission + '&projectId=' + this.options.project, + searchUrl: getSearchUrl(this.options.permission, this.options.project), selectUrl: baseUrl + '/api/permissions/add_user', deselectUrl: baseUrl + '/api/permissions/remove_user', extra: { @@ -44,8 +48,7 @@ define([ serializeData: function () { return _.extend(Modal.prototype.serializeData.apply(this, arguments), { projectName: this.options.projectName - }) - + }); } }); diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/helpers.js b/server/sonar-web/src/main/js/apps/quality-profiles/helpers.js index cea70a76069..cdc1ba0c142 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/helpers.js +++ b/server/sonar-web/src/main/js/apps/quality-profiles/helpers.js @@ -41,9 +41,11 @@ Handlebars.registerHelper('parameterChangelog', function (value, parameter) { if (parameter) { - return new Handlebars.SafeString(window.tp('quality_profiles.parameter_set_to_x', value, parameter)); + return new Handlebars.SafeString( + window.tp('quality_profiles.parameter_set_to_x', value, parameter)); } else { - return new Handlebars.SafeString(window.tp('quality_profiles.changelog.parameter_reset_to_default_value_x', parameter)); + return new Handlebars.SafeString( + window.tp('quality_profiles.changelog.parameter_reset_to_default_value_x', parameter)); } }); diff --git a/server/sonar-web/src/main/js/apps/source-viewer/app.js b/server/sonar-web/src/main/js/apps/source-viewer/app.js index f9ccf31b248..31b6047d152 100644 --- a/server/sonar-web/src/main/js/apps/source-viewer/app.js +++ b/server/sonar-web/src/main/js/apps/source-viewer/app.js @@ -20,7 +20,6 @@ define([ }; App.on('start', function (options) { - console.log(options); if (options.component) { init.call(App, options); } |