Merge pull request #2722 from yaacov/uniform-behaviour-timeline-utili…

…zation-button Uniform the behaviour of timeline and utilization button (cherry picked from commit d1f626f) https://bugzilla.redhat.com/show_bug.cgi?id=1513602
ManageIQ · Nov 15, 2017 · d012b90 · d012b90
1 parent 01803f5
commit d012b90
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 15 deletions.
diff --git a/app/helpers/application_helper/button/container_perf.rb b/app/helpers/application_helper/button/container_perf.rb
@@ -1,8 +1,17 @@
 class ApplicationHelper::Button::ContainerPerf < ApplicationHelper::Button::Basic
   needs(:@record)
 
+  def initialize(view_context, view_binding, instance_data, props)
+    super
+    @entity = props[:options][:entity] || N_('Entity')
+  end
+
   def disabled?
-    @error_message = _('No Capacity & Utilization data has been collected for this Container') unless @record.has_perf_data?
+    unless @record.has_perf_data?
+      @error_message = _('No Capacity & Utilization data has been collected for this %{entity}') %
+                       {:entity => _(@entity)}
+    end
+
     @error_message.present?
   end
 end
diff --git a/app/helpers/application_helper/toolbar/container_center.rb b/app/helpers/application_helper/toolbar/container_center.rb
@@ -13,7 +13,7 @@ class ApplicationHelper::Toolbar::ContainerCenter < ApplicationHelper::Toolbar::
           N_('Timelines'),
           :url       => "/show",
           :url_parms => "?display=timeline",
-          :options   => {:entity => 'Container'},
+          :options   => {:entity => N_('Container')},
           :klass     => ApplicationHelper::Button::ContainerTimeline
         ),
         button(
@@ -23,6 +23,7 @@ class ApplicationHelper::Toolbar::ContainerCenter < ApplicationHelper::Toolbar::
           N_('Utilization'),
           :url       => "/show",
           :url_parms => "?display=performance",
+          :options   => {:entity => N_('Container')},
           :klass     => ApplicationHelper::Button::ContainerPerf
         ),
       ]

diff --git a/app/helpers/application_helper/toolbar/container_group_center.rb b/app/helpers/application_helper/toolbar/container_group_center.rb
@@ -9,19 +9,22 @@ class ApplicationHelper::Toolbar::ContainerGroupCenter < ApplicationHelper::Tool
         button(
           :container_group_timeline,
           'ff ff-timeline fa-lg',
-          N_('Show Timelines for this Group'),
+          N_('Show Timelines for this Pod'),
           N_('Timelines'),
           :url       => "/show",
           :url_parms => "?display=timeline",
-          :options   => {:entity => 'Group'},
+          :options   => {:entity => N_('Pod')},
           :klass     => ApplicationHelper::Button::ContainerTimeline),
         button(
           :container_group_perf,
           'ff ff-monitoring fa-lg',
-          N_('Show Capacity & Utilization data for this Group'),
+          N_('Show Capacity & Utilization data for this Pod'),
           N_('Utilization'),
           :url       => "/show",
-          :url_parms => "?display=performance"),
+          :url_parms => "?display=performance",
+          :options   => {:entity => N_('Pod')},
+          :klass     => ApplicationHelper::Button::ContainerPerf,
+        ),
       ]
     ),
   ])

diff --git a/app/helpers/application_helper/toolbar/container_node_center.rb b/app/helpers/application_helper/toolbar/container_node_center.rb
@@ -13,15 +13,18 @@ class ApplicationHelper::Toolbar::ContainerNodeCenter < ApplicationHelper::Toolb
           N_('Timelines'),
           :url       => "/show",
           :url_parms => "?display=timeline",
-          :options   => {:entity => 'Node'},
+          :options   => {:entity => N_('Node')},
           :klass     => ApplicationHelper::Button::ContainerTimeline),
         button(
           :container_node_perf,
           'ff ff-monitoring fa-lg',
           N_('Show Capacity & Utilization data for this Node'),
           N_('Utilization'),
           :url       => "/show",
-          :url_parms => "?display=performance"),
+          :url_parms => "?display=performance",
+          :options   => {:entity => N_('Node')},
+          :klass     => ApplicationHelper::Button::ContainerPerf,
+        ),
         button(
           :ems_container_ad_hoc_metrics,
           'fa fa-tachometer fa-1xplus',

diff --git a/app/helpers/application_helper/toolbar/container_project_center.rb b/app/helpers/application_helper/toolbar/container_project_center.rb
@@ -13,15 +13,18 @@ class ApplicationHelper::Toolbar::ContainerProjectCenter < ApplicationHelper::To
           N_('Timelines'),
           :url       => "/show",
           :url_parms => "?display=timeline",
-          :options   => {:entity => 'Project'},
+          :options   => {:entity => N_('Project')},
           :klass     => ApplicationHelper::Button::ContainerTimeline),
         button(
           :container_project_perf,
           'ff ff-monitoring fa-lg',
           N_('Show Capacity & Utilization data for this Project'),
           N_('Utilization'),
           :url       => "/show",
-          :url_parms => "?display=performance"),
+          :url_parms => "?display=performance",
+          :options   => {:entity => N_('Project')},
+          :klass     => ApplicationHelper::Button::ContainerPerf,
+        ),
       ]
     ),
   ])

diff --git a/app/helpers/application_helper/toolbar/container_service_center.rb b/app/helpers/application_helper/toolbar/container_service_center.rb
@@ -12,7 +12,10 @@ class ApplicationHelper::Toolbar::ContainerServiceCenter < ApplicationHelper::To
           N_('Show Capacity & Utilization data for this Service'),
           N_('Utilization'),
           :url       => "/show",
-          :url_parms => "?display=performance"),
+          :url_parms => "?display=performance",
+          :options   => {:entity => N_('Service')},
+          :klass     => ApplicationHelper::Button::ContainerPerf,
+        ),
       ]
     ),
   ])

diff --git a/app/helpers/application_helper/toolbar/ems_container_center.rb b/app/helpers/application_helper/toolbar/ems_container_center.rb
@@ -62,16 +62,16 @@ class ApplicationHelper::Toolbar::EmsContainerCenter < ApplicationHelper::Toolba
           'ff ff-timeline fa-lg',
           N_('Show Timelines for this Containers Provider'),
           N_('Timelines'),
-          :klass     => ApplicationHelper::Button::GenericFeatureButton,
-          :options   => {:feature => :timeline},
+          :klass     => ApplicationHelper::Button::ContainerTimeline,
+          :options   => {:feature => :timeline, :entity => N_('Provider')},
           :url_parms => "?display=timeline"),
         button(
           :ems_container_perf,
           'ff ff-monitoring fa-lg',
           N_('Show Capacity & Utilization data for this Provider'),
           N_('Utilization'),
-          :klass     => ApplicationHelper::Button::GenericFeatureButton,
-          :options   => {:feature => :performance},
+          :klass     => ApplicationHelper::Button::ContainerPerf,
+          :options   => {:feature => :performance, :entity => N_('Provider')},
           :url_parms => "?display=performance"),
         button(
           :ems_container_ad_hoc_metrics,