SONAR-2781 The annotation @UserRole should be optional on web page extensions

1 files changed, 8 insertions, 5 deletions

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb
index 8cdc48be703..2ca2eadfa51 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb
@@ -55,10 +55,14 @@ class ResourceController < ApplicationController
   def load_extensions
     @extensions=[]
     java_facade.getResourceTabs(@resource.scope, @resource.qualifier, @resource.language).each do |tab|
-      tab.getUserRoles().each do |role|
-        if has_role?(role, @resource)
-          @extensions<<tab
-          break
+      if tab.getUserRoles().empty?
+        @extensions<<tab
+      else
+        tab.getUserRoles().each do |role|
+          if has_role?(role, @resource)
+            @extensions<<tab
+            break
+          end
         end
       end
     end
@@ -69,7 +73,6 @@ class ResourceController < ApplicationController
     elsif !params[:metric].blank?
       metric=Metric.by_key(params[:metric])
       @extension=@extensions.find{|extension| extension.getDefaultTabForMetrics().include?(metric.key)}
-
     end
     @extension=@extensions.find{|extension| extension.isDefaultTab()} if @extension==nil
   end