]> source.dussan.org Git - sonarqube.git/commitdiff
Fix widget controller for global widgets
authorDavid Gageot <david@gageot.net>
Mon, 14 May 2012 08:57:30 +0000 (10:57 +0200)
committerDavid Gageot <david@gageot.net>
Mon, 14 May 2012 08:57:30 +0000 (10:57 +0200)
For global widgets, we shouldn't force loading a resource.

sonar-server/src/main/webapp/WEB-INF/app/controllers/widget_controller.rb

index 4de58f31d565073467791e9b7c80147445a068bc..01de177bc2f6e98f1d83934afbe5d1d5c0fe5a56 100644 (file)
@@ -32,12 +32,14 @@ class WidgetController < ApplicationController
   private
 
   def load_resource
-    @resource=Project.by_key(params[:resource])
-    not_found("Resource not found") unless @resource
-    access_denied unless has_role?(:user, @resource)
+    if params[:resource]
+      @resource=Project.by_key(params[:resource])
+      not_found("Resource not found") unless @resource
+      access_denied unless has_role?(:user, @resource)
 
-    @project=@resource
-    @snapshot = @resource.last_snapshot
+      @project=@resource
+      @snapshot = @resource.last_snapshot
+    end
   end
 
   def load_widget
@@ -67,4 +69,4 @@ class WidgetController < ApplicationController
     @dashboard_configuration=Api::DashboardConfiguration.new(nil, :period_index => params[:period], :snapshot => @snapshot)
     @widget_width = params[:widget_width] || '350px'
   end
-end
\ No newline at end of file
+end