diff --git a/app/controllers/application_controller/report_data_additional_options.rb b/app/controllers/application_controller/report_data_additional_options.rb index 568e212e16e..2ab7be1830a 100644 --- a/app/controllers/application_controller/report_data_additional_options.rb +++ b/app/controllers/application_controller/report_data_additional_options.rb @@ -17,7 +17,8 @@ class ApplicationController :listicon, :embedded, :showlinks, - :policy_sim + :policy_sim, + :lastaction ) do def self.from_options(options) additional_options = new @@ -38,6 +39,7 @@ def with_quadicon_options(options) self.embedded = options[:embedded] self.showlinks = options[:showlinks] self.policy_sim = options[:policy_sim] + self.lastaction = options[:lastaction] end def with_row_button(row_button) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5be4cedde73..bfd09229ad4 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1636,7 +1636,8 @@ def process_show_list_options(options, curr_model = nil) :listicon => @listicon, :embedded => @embedded, :showlinks => @showlinks, - :policy_sim => @policy_sim + :policy_sim => @policy_sim, + :lastaction => @lastaction ) @report_data_additional_options.with_row_button(@row_button) if @row_button @report_data_additional_options.with_menu_click(params[:menu_click]) if params[:menu_click] diff --git a/spec/controllers/vm_infra_controller_spec.rb b/spec/controllers/vm_infra_controller_spec.rb index 39fe64b4526..6e97304ac8f 100644 --- a/spec/controllers/vm_infra_controller_spec.rb +++ b/spec/controllers/vm_infra_controller_spec.rb @@ -19,6 +19,14 @@ render_views it 'can render the explorer' do + expect_any_instance_of(GtlHelper).to receive(:render_gtl).with match_gtl_options( + :model_name => 'VmOrTemplate', + :report_data_additional_options => { + :model => "VmOrTemplate", + :lastaction => 'show_list' + } + ) + get :explorer expect(response.status).to eq(200) expect(response.body).to_not be_empty