CustomButtons: remove question marks from custom_toolbar*?.

ManageIQ · Apr 11, 2017 · b6408ee · b6408ee
1 parent 6834d56
commit b6408ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/controllers/mixins/custom_buttons.rb b/app/controllers/mixins/custom_buttons.rb
@@ -1,13 +1,13 @@
 module Mixins::CustomButtons
   extend ActiveSupport::Concern
 
-  def custom_toolbar?
+  def custom_toolbar
     return nil unless self.class.instance_eval { @custom_buttons }
 
-    @explorer ? custom_toolbar_explorer? : custom_toolbar_simple?
+    @explorer ? custom_toolbar_explorer : custom_toolbar_simple
   end
 
-  def custom_toolbar_explorer?
+  def custom_toolbar_explorer
     if x_tree
       if @display == "main" && @record
         Mixins::CustomButtons::Result.new(:single)
@@ -19,7 +19,7 @@ def custom_toolbar_explorer?
     end
   end
 
-  def custom_toolbar_simple?
+  def custom_toolbar_simple
     if @record && @lastaction == "show" && @display == "main"
       Mixins::CustomButtons::Result.new(:single)
     elsif @lastaction == "show_list"

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -718,7 +718,7 @@ def calculate_toolbars
     end
 
     toolbars['center_tb'] = center_toolbar_filename
-    toolbars['custom_tb'] = controller.custom_toolbar?
+    toolbars['custom_tb'] = controller.custom_toolbar
 
     toolbars['view_tb'] = inner_layout_present? ? x_view_toolbar_filename : view_toolbar_filename
     toolbars