CustomToolbar: for plural case the record class needs to be taken fro…

…m the list being displayed.

app/controllers/vm_common.rb

@@ -1157,6 +1157,11 @@ def get_node_info(treenodeid)
       end
       # Add adv search filter to header
       @right_cell_text += @edit[:adv_search_applied][:text] if @edit && @edit[:adv_search_applied]
+
+      # save model being displayed for custom buttons
+      @tree_selected_model = if model.present?
+                               model.constantize
+                             end
     end
 
     if @edit && @edit.fetch_path(:adv_search_applied, :qs_exp) # If qs is active, save it in history

app/helpers/application_helper/toolbar_builder.rb

@@ -58,12 +58,15 @@ def controller
     @view_context.respond_to?(:controller) ? @view_context.controller : @view_context
   end
 
+  def model_for_custom_toolbar
+    controller.instance_eval { @tree_selected_model } || controller.class.model
+  end
+
   # According to toolbar name in parameter `toolbar_name` either returns class
   # for generic toolbar, or starts building custom toolbar
   def toolbar_class(toolbar_name)
     if Mixins::CustomButtons::Result === toolbar_name
-      model = @record ? @record.class : controller.class.model
-      custom_toolbar_class(model, @record, toolbar_name)
+      custom_toolbar_class(toolbar_name)
     else
       predefined_toolbar_class(toolbar_name)
     end
@@ -280,7 +283,12 @@ def custom_button_selects(model, record, toolbar_result)
     end
   end
 
-  def custom_toolbar_class(model, record, toolbar_result)
+  def custom_toolbar_class(toolbar_result)
+    model = @record ? @record.class : model_for_custom_toolbar
+    build_custom_toolbar_class(model, @record, toolbar_result)
+  end
+
+  def build_custom_toolbar_class(model, record, toolbar_result)
     # each custom toolbar is an anonymous subclass of this class
 
     toolbar = Class.new(ApplicationHelper::Toolbar::Basic)

spec/helpers/application_helper/toolbar_builder_spec.rb

@@ -23,8 +23,8 @@
         expect(toolbar_builder.custom_button_selects(subject.class, subject, Mixins::CustomButtons::Result.new(:single))).to be_blank
       end
 
-      it ("#custom_toolbar_class") do
-        expect(toolbar_builder.custom_toolbar_class(subject.class, subject, Mixins::CustomButtons::Result.new(:single)).definition).to be_blank
+      it ("#build_custom_toolbar_class") do
+        expect(toolbar_builder.build_custom_toolbar_class(subject.class, subject, Mixins::CustomButtons::Result.new(:single)).definition).to be_blank
       end
 
       it("#record_to_service_buttons") { expect(toolbar_builder.record_to_service_buttons(subject)).to be_blank }
@@ -93,7 +93,7 @@
         expect(result).to eq([:name => name, :items => items])
       end
 
-      it "#custom_toolbar_class" do
+      it "#build_custom_toolbar_class" do
         escaped_button1_text = CGI.escapeHTML(@button1.name.to_s)
         button1 = {
           :id        => "custom__custom_#{@button1.id}",
@@ -117,7 +117,7 @@
           :items   => button_set_item1_items
         }
         group_name = "custom_buttons_#{@button_set.name}"
-        expect(toolbar_builder.custom_toolbar_class(subject.class, subject, Mixins::CustomButtons::Result.new(:single)).definition[group_name].buttons).to eq([button_set_item1])
+        expect(toolbar_builder.build_custom_toolbar_class(subject.class, subject, Mixins::CustomButtons::Result.new(:single)).definition[group_name].buttons).to eq([button_set_item1])
       end
     end