fix redirect when adding a widget with a selected category

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb
index 44030fb548dd1d61e30a695aa1011924c17421a4..b9194b180d7e45d28fe307bdacf16aa91808a6e7 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb
@@ -141,7 +141,7 @@ class DashboardController < ApplicationController
 
   def widget_definitions
     load_widget_definitions(params[:category])
-    render :partial => 'dashboard/widget_definitions', :locals => {:dashboard_id => params[:did], :resource_id => params[:rid], :filter_on_category => params[:category]}
+    render :partial => 'dashboard/widget_definitions', :locals => {:dashboard_id => params[:did], :resource_id => params[:id], :filter_on_category => params[:category]}
   end
 
   private

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/configure.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/configure.html.erb
index 504e9f0a33dcf8ee9ab27706ff80f9a913a64208..75c89a89aa0f919c43615afc56be457b5c9e3602 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/configure.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/configure.html.erb
@@ -28,7 +28,7 @@
     function filterWidgets(category){
       new Ajax.Updater(
         'widget_defs',
-        '<%= url_for :controller => "dashboard", :action => "widget_definitions", :did => @dashboard.id, :rid => @resource.id -%>&category=' + category,
+        '<%= url_for :controller => "dashboard", :action => "widget_definitions", :did => @dashboard.id, :id => @resource.id -%>&category=' + category,
         {asynchronous:true, evalScripts:true});
       $('filter-widgets-loading').show();
       return false;