Merge pull request #1589 from romanblanco/bz1454600

Enabled 'Delete Saved Report' toolbar button (cherry picked from commit af93bea) https://bugzilla.redhat.com/show_bug.cgi?id=1478400
ManageIQ · Aug 4, 2017 · bff7eb1 · bff7eb1
1 parent fd60ae8
commit bff7eb1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/controllers/report_controller/saved_reports.rb b/app/controllers/report_controller/saved_reports.rb
@@ -90,6 +90,11 @@ def fetch_saved_report(id)
   def saved_report_delete
     assert_privileges("saved_report_delete")
     savedreports = find_checked_items
+    unless savedreports.present?
+      report_result = x_node.split('_').last
+      savedreport = report_result.split('-').last
+      savedreports = Array.wrap(from_cid(savedreport))
+    end
 
     if savedreports.empty? && params[:id].present? && !MiqReportResult.for_user(current_user).exists?(params[:id].to_i)
       # saved report is being viewed in report accordion

diff --git a/app/helpers/application_helper/button/saved_report_delete.rb b/app/helpers/application_helper/button/saved_report_delete.rb
@@ -8,6 +8,6 @@ def visible?
   private
 
   def saved_report?
-    @view_context.active_tab == 'saved_reports'
+    %w(saved_reports report_info).include?(@view_context.active_tab)
   end
 end