diff options
| author | Julien Lancelot <julien.lancelot@gmail.com> | 2013-08-13 13:07:17 +0200 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@gmail.com> | 2013-08-13 13:07:17 +0200 |
| commit | 0b2db7fd21b6970f91a57bc9ed74352a8e53cad1 (patch) | |
| tree | a127cb95c645f681c1dda4eefa6ae1b14660cb22 /sonar-server | |
| parent | 7acf0fddba82c05936a2cc4143eef4e77a57f316 (diff) | |
| download | sonarqube-0b2db7fd21b6970f91a57bc9ed74352a8e53cad1.tar.gz sonarqube-0b2db7fd21b6970f91a57bc9ed74352a8e53cad1.zip | |
SONAR-4573 Remove the hack which leads do display the 'Project Permissions' page on views even if the property 'hasRolePolicy' is not defined on views
Diffstat (limited to 'sonar-server')
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/controllers/bulk_deletion_controller.rb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/bulk_deletion_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/bulk_deletion_controller.rb index 21efff30418..b667d4ccc0a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/bulk_deletion_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/bulk_deletion_controller.rb @@ -44,8 +44,7 @@ class BulkDeletionController < ApplicationController conditions += " AND projects.enabled=:enabled" values[:enabled] = true - @resources = Project.find(:all, - :select => 'distinct(resource_index.resource_id),projects.id,projects.name,projects.kee,projects.long_name', + @resources = Project.all(:select => 'distinct(resource_index.resource_id),projects.id,projects.name,projects.kee,projects.long_name', :conditions => [conditions, values], :joins => :resource_index) @resources = Api::Utils.insensitive_sort!(@resources){|r| r.name} @@ -61,10 +60,14 @@ class BulkDeletionController < ApplicationController conditions = "scope=:scope AND qualifier IN (:qualifiers) AND status=:status" values = {:scope => 'PRJ', :qualifiers => @tabs} - unprocessed_project_ids = Snapshot.find(:all, :select => 'project_id', :conditions => [conditions, values.merge({:status => Snapshot::STATUS_UNPROCESSED})]).map(&:project_id).uniq - already_processed_project_ids = Snapshot.find(:all, :select => 'project_id', :conditions => [conditions + " AND project_id IN (:pids)", values.merge({:status => Snapshot::STATUS_PROCESSED, :pids => unprocessed_project_ids})]).map(&:project_id).uniq + unprocessed_project_ids = Snapshot.all( + :select => 'project_id', + :conditions => [conditions, values.merge({:status => Snapshot::STATUS_UNPROCESSED})]).map(&:project_id).uniq + already_processed_project_ids = Snapshot.all( + :select => 'project_id', + :conditions => [conditions + " AND project_id IN (:pids)", values.merge({:status => Snapshot::STATUS_PROCESSED, :pids => unprocessed_project_ids})]).map(&:project_id).uniq - @ghosts = Project.find(:all, :conditions => ["id IN (?)", unprocessed_project_ids - already_processed_project_ids]) + @ghosts = Project.all(:conditions => ["id IN (?)", unprocessed_project_ids - already_processed_project_ids]) @ghosts_by_qualifier = {} @ghosts.each do |p| |