Merge pull request #69 from martinpovolny/session_report_result

One less place to store report results id.
ManageIQ · Jan 5, 2017 · 1e847e3 · 1e847e3
2 parents 76d9fe0 + 1a59fcd
commit 1e847e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -173,12 +173,10 @@ def render_chart
       rpt = MiqReport.find_by_name(params[:report])
       rpt.generate_table(:userid => session[:userid])
     else
-      rpt = if controller_name == "dashboard" && @sb[:report_result_id] # Check for dashboard results
-              MiqReportResult.find(@sb[:report_result_id]).report_results
+      rpt = if session[:report_result_id]
+              MiqReportResult.find(session[:report_result_id]).report_results
             elsif session[:rpt_task_id].present?
               MiqTask.find(session[:rpt_task_id]).task_results
-            elsif session[:report_result_id]
-              MiqReportResult.find(session[:report_result_id]).report_results
             else
               @report
             end

diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
@@ -253,8 +253,8 @@ def widget_zoom
     end
 
     widget = MiqWidget.find_by_id(params[:widget].to_i)
-    # Save the rr id for render_zgraph
-    @sb[:report_result_id] = widget.contents_for_user(current_user).miq_report_result_id
+    # Save the rr id for rendering
+    session[:report_result_id] = widget.contents_for_user(current_user).miq_report_result_id
 
     render :update do |page|
       page << javascript_prologue