Merge pull request #7039 from h-kataria/cb_rates_no_explorer

Chargeback Rates non explorer (cherry picked from commit cdf3b48)
ManageIQ · May 21, 2020 · 9b8376f · 9b8376f
1 parent 978f54b
commit 9b8376f
Show file tree

Hide file tree

Showing 31 changed files with 347 additions and 493 deletions.
diff --git a/app/controllers/application_controller/report_downloads.rb b/app/controllers/application_controller/report_downloads.rb
@@ -211,7 +211,7 @@ def set_summary_pdf_data
       :page_layout => "portrait",
       :page_size   => "us-letter",
       :run_date    => run_time.strftime("%m/%d/%y %l:%m %p %z"),
-      :title       => "#{klass} \"#{@record.name}\"".html_safe,
+      :title       => "#{klass} \"#{get_record_display_name(@record)}\"".html_safe,
       :quadicon    => true
     }
 

diff --git a/app/controllers/chargeback_assignment_controller.rb b/app/controllers/chargeback_assignment_controller.rb
@@ -368,7 +368,7 @@ def replace_right_cell(options = {})
         presenter.show(:paging_div, :form_buttons_div).remove_paging
         locals = {:record_id => @edit[:rec_id]}
         if x_active_tree == :cb_rates_tree
-          locals[:action_url] = 'cb_rate_edit'
+          locals[:action_url] = 'edit'
         else
           locals.update(
             :action_url   => 'cb_assign_update',