SONAR-3383 fix compatibility with views plugin

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/roles_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/roles_controller.rb
index fdb364e30d784960f7a8ce9e5995b33a6894afbd..c5fe2b39846d9929482fb603cc90afeb0e7542ef 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/roles_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/roles_controller.rb
@@ -30,13 +30,14 @@ class RolesController < ApplicationController
   end
 
   def projects
-    @qualifiers = java_facade.getQualifiersWithProperty('hasRolePolicy')
+    # for backward-compatibility with versions of views plugin that do not depend on sonar 2.15
+    @qualifiers = (['VW', 'SVW'] + java_facade.getQualifiersWithProperty('hasRolePolicy').to_a).compact.uniq
     @qualifier = params[:qualifier] || 'TRK'
 
     # it's not possible to paginate directly in database because
     # sort would be case-sensitive
 
-    conditions_sql = 'projects.enabled=:enabled and projects.qualifier=:qualifier'
+    conditions_sql = 'projects.enabled=:enabled and projects.qualifier=:qualifier and projects.copy_resource_id is null'
     conditions_values = {:enabled => true, :qualifier => @qualifier}
 
     if params[:q].present?