Merge pull request #1323 from martinpovolny/generic_object_toolbar_cl…

…eanup Unify generic object toolbar selection with the other toolbars.
ManageIQ · May 15, 2017 · d315a66 · d315a66
2 parents 26ad377 + 3cdeee3
commit d315a66
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 48 deletions.
diff --git a/app/controllers/generic_object_controller.rb b/app/controllers/generic_object_controller.rb
@@ -75,4 +75,5 @@ def features
   end
 
   menu_section :automate
+  toolbar :generic_object_definition
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -820,7 +820,12 @@ def calculate_toolbars
       toolbars['summary_center_tb'] = controller.restful? ? "summary_center_restful_tb" : "summary_center_tb"
     end
 
-    toolbars['center_tb'] = center_toolbar_filename
+    # FIXME: singular vs plural for controller.class.toolbar_singular
+    toolbars['center_tb'] = if controller.class.toolbar_singular.present?
+                              "#{controller.class.toolbar_singular}_center_tb"
+                            else
+                              center_toolbar_filename
+                            end
     toolbars['custom_tb'] = controller.custom_toolbar
 
     toolbars['view_tb'] = inner_layout_present? ? x_view_toolbar_filename : view_toolbar_filename

diff --git a/...lper/toolbar/generic_object_definition.rb → ...olbar/generic_object_definition_center.rb b/...lper/toolbar/generic_object_definition.rb → ...olbar/generic_object_definition_center.rb
@@ -1,4 +1,4 @@
-class ApplicationHelper::Toolbar::GenericObjectDefinition < ApplicationHelper::Toolbar::Basic
+class ApplicationHelper::Toolbar::GenericObjectDefinitionCenter < ApplicationHelper::Toolbar::Basic
   button_group('generic_object_definition', [
     select(
       :generic_object_definition_choice,

diff --git a/app/helpers/application_helper/toolbar_chooser.rb b/app/helpers/application_helper/toolbar_chooser.rb
@@ -667,6 +667,7 @@ def unassigned_configuration_profile_node(nodes)
   end
 
   NO_GTL_VIEW_BUTTONS = %w(chargeback
+                           generic_object
                            generic_object_definition
                            miq_ae_class
                            miq_ae_customization

diff --git a/app/helpers/generic_object_helper.rb b/app/helpers/generic_object_helper.rb
diff --git a/spec/controllers/generic_object_controller_spec.rb b/spec/controllers/generic_object_controller_spec.rb
@@ -90,6 +90,10 @@
       )
     end
 
+    it "sets the GenericObjectDefinition toolbar" do
+      expect(described_class.toolbar_singular).to eq(:generic_object_definition)
+    end
+
     it "sets up the trees variable" do
       expect(assigns[:trees]).to eq("nodes")
     end

diff --git a/spec/helpers/application_helper/toolbar_builder_spec.rb b/spec/helpers/application_helper/toolbar_builder_spec.rb
@@ -479,7 +479,7 @@
     end
 
     context "when the toolbar to be built is a generic object toolbar" do
-      let(:toolbar_to_build) { 'generic_object_definition_tb' }
+      let(:toolbar_to_build) { 'generic_object_definition_center_tb' }
 
       before do
         allow(Rbac).to receive(:role_allows?).and_return(true)
@@ -549,7 +549,7 @@
     end
 
     context "when the toolbar to be built is a generic object toolbar" do
-      let(:toolbar_to_build) { ApplicationHelper::Toolbar::GenericObjectDefinition }
+      let(:toolbar_to_build) { ApplicationHelper::Toolbar::GenericObjectDefinitionCenter }
 
       before do
         allow(Rbac).to receive(:role_allows?).and_return(true)

diff --git a/spec/helpers/generic_object_helper_spec.rb b/spec/helpers/generic_object_helper_spec.rb