From 0e241f527c97b2aa34bf5838f5bb7d476aa1c09b Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Thu, 19 Sep 2013 19:59:49 +0200 Subject: [PATCH] Rename Permisson by GlobalPermission in ruby files --- .../WEB-INF/app/controllers/batch_bootstrap_controller.rb | 8 ++++---- .../main/webapp/WEB-INF/app/views/roles/global.html.erb | 2 +- .../db/migrate/414_add_scan_and_dry_run_permissions.rb | 4 ++-- .../src/main/webapp/WEB-INF/lib/need_authorization.rb | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/batch_bootstrap_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/batch_bootstrap_controller.rb index 36715cd1bed..35bd7b54f20 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/batch_bootstrap_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/batch_bootstrap_controller.rb @@ -26,7 +26,7 @@ class BatchBootstrapController < Api::ApiController # GET /batch_bootstrap/db?project= def db - has_dryrun_role = has_role?(Java::OrgSonarCorePermission::Permission::DRY_RUN_EXECUTION) + has_dryrun_role = has_role?(Java::OrgSonarCorePermission::GlobalPermission::DRY_RUN_EXECUTION) return render_unauthorized("You're not authorized to execute a dry run analysis. Please contact your SonarQube administrator.") if !has_dryrun_role project = load_project() return render_unauthorized("You're not authorized to access to project '" + project.name + "', please contact your SonarQube administrator") if project && !has_role?(:user, project) @@ -37,7 +37,7 @@ class BatchBootstrapController < Api::ApiController # PUT /batch_bootstrap/evict?project= def evict - has_scan_role = has_role?(Java::OrgSonarCorePermission::Permission::SCAN_EXECUTION) + has_scan_role = has_role?(Java::OrgSonarCorePermission::GlobalPermission::SCAN_EXECUTION) return render_unauthorized("You're not authorized to execute any SonarQube analysis. Please contact your SonarQube administrator.") if !has_scan_role project = load_project() @@ -54,8 +54,8 @@ class BatchBootstrapController < Api::ApiController # GET /batch_bootstrap/properties?[project=][&dryRun=true|false] def properties dryRun = params[:dryRun].present? && params[:dryRun] == "true" - has_dryrun_role = has_role?(Java::OrgSonarCorePermission::Permission::DRY_RUN_EXECUTION) - has_scan_role = has_role?(Java::OrgSonarCorePermission::Permission::SCAN_EXECUTION) + has_dryrun_role = has_role?(Java::OrgSonarCorePermission::GlobalPermission::DRY_RUN_EXECUTION) + has_scan_role = has_role?(Java::OrgSonarCorePermission::GlobalPermission::SCAN_EXECUTION) return render_unauthorized("You're not authorized to execute any SonarQube analysis. Please contact your SonarQube administrator.") if (!has_dryrun_role && !has_scan_role) return render_unauthorized("You're only authorized to execute a local (dry run) SonarQube analysis without pushing the results to the SonarQube server. Please contact your SonarQube administrator.") if (!dryRun && !has_scan_role) diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb index b05d1f224c3..7d2bc2747e9 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb @@ -10,7 +10,7 @@ <% - permission_keys = Java::OrgSonarCorePermission::Permission::allGlobal.keySet + permission_keys = Java::OrgSonarCorePermission::GlobalPermission::allGlobal.keySet key_to_name = permission_keys.inject({}) do |hash, key| hash[key] = message("global_permissions.#{key}") hash diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/414_add_scan_and_dry_run_permissions.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/414_add_scan_and_dry_run_permissions.rb index 5ad9b2fb3d4..c4f97f7c5e3 100644 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/414_add_scan_and_dry_run_permissions.rb +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/414_add_scan_and_dry_run_permissions.rb @@ -34,11 +34,11 @@ class AddScanAndDryRunPermissions < ActiveRecord::Migration def self.up # -- Role scan -- # Anyone - GroupRole.create(:group_id => nil, :role => Java::OrgSonarCorePermission::Permission::SCAN_EXECUTION.key, :resource_id => nil) + GroupRole.create(:group_id => nil, :role => Java::OrgSonarCorePermission::GlobalPermission::SCAN_EXECUTION.key, :resource_id => nil) # -- Role dryRunScan -- # Anyone - GroupRole.create(:group_id => nil, :role => Java::OrgSonarCorePermission::Permission::DRY_RUN_EXECUTION.key, :resource_id => nil) + GroupRole.create(:group_id => nil, :role => Java::OrgSonarCorePermission::GlobalPermission::DRY_RUN_EXECUTION.key, :resource_id => nil) end end diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/need_authorization.rb b/sonar-server/src/main/webapp/WEB-INF/lib/need_authorization.rb index 95161fbf12e..92d5978e94b 100644 --- a/sonar-server/src/main/webapp/WEB-INF/lib/need_authorization.rb +++ b/sonar-server/src/main/webapp/WEB-INF/lib/need_authorization.rb @@ -57,10 +57,10 @@ module NeedAuthorization # has_role?(:admin, [30,45,7]) checks if the user is administrator of the projects 30, 40 and 7. It returns an array of 3 booleans. # def has_role?(role, objects=nil) - role = role.key if role.java_kind_of?(Java::OrgSonarCorePermission::Permission) + role = role.key if role.java_kind_of?(Java::OrgSonarCorePermission::GlobalPermission) role = role.to_s if objects.nil? - if Java::OrgSonarCorePermission::Permission::allGlobal.keySet.include?(role) + if Java::OrgSonarCorePermission::GlobalPermission::allGlobal.keySet.include?(role) AuthorizerFactory.authorizer.has_role?(self, role.to_sym) else # There's no concept of global users or global codeviewers. -- 2.39.5