Merge pull request #1413 from skateman/log-collection-fix

Fixed prompt for log collection by reorganizing button inheritance (cherry picked from commit 5288862) https://bugzilla.redhat.com/show_bug.cgi?id=1460033
ManageIQ · Jun 8, 2017 · 0359517 · 0359517
1 parent 924c9f7
commit 0359517
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 25 deletions.
diff --git a/app/helpers/application_helper/button/collect_logs.rb b/app/helpers/application_helper/button/collect_logs.rb
@@ -1,4 +1,5 @@
-class ApplicationHelper::Button::CollectLogs < ApplicationHelper::Button::DiagnosticsLogs
+class ApplicationHelper::Button::CollectLogs < ApplicationHelper::Button::LogDepotEdit
+  include ApplicationHelper::Button::Mixins::ButtonPromptMixin
   needs :@record
 
   def disabled?

diff --git a/...ication_helper/button/diagnostics_logs.rb → ...plication_helper/button/log_depot_edit.rb b/...ication_helper/button/diagnostics_logs.rb → ...plication_helper/button/log_depot_edit.rb
@@ -1,4 +1,4 @@
-class ApplicationHelper::Button::DiagnosticsLogs < ApplicationHelper::Button::Logs
+class ApplicationHelper::Button::LogDepotEdit < ApplicationHelper::Button::Basic
   include ApplicationHelper::Button::Mixins::ActiveContextMixin
 
   def visible?

diff --git a/...helpers/application_helper/button/logs.rb → ...lper/button/mixins/button_prompt_mixin.rb b/...helpers/application_helper/button/logs.rb → ...lper/button/mixins/button_prompt_mixin.rb
@@ -1,4 +1,4 @@
-class ApplicationHelper::Button::Logs < ApplicationHelper::Button::Basic
+module ApplicationHelper::Button::Mixins::ButtonPromptMixin
   def calculate_properties
     super
     self[:prompt] = @record.try(:log_file_depot).try(:requires_support_case?)

diff --git a/app/helpers/application_helper/button/zone_collect_logs.rb b/app/helpers/application_helper/button/zone_collect_logs.rb
@@ -1,4 +1,5 @@
-class ApplicationHelper::Button::ZoneCollectLogs < ApplicationHelper::Button::ZoneLogDepotEdit
+class ApplicationHelper::Button::ZoneCollectLogs < ApplicationHelper::Button::LogDepotEdit
+  include ApplicationHelper::Button::Mixins::ButtonPromptMixin
   needs :@record
 
   def disabled?

diff --git a/app/helpers/application_helper/button/zone_log_depot_edit.rb b/app/helpers/application_helper/button/zone_log_depot_edit.rb
diff --git a/app/helpers/application_helper/toolbar/diagnostics_server_center.rb b/app/helpers/application_helper/toolbar/diagnostics_server_center.rb
@@ -84,7 +84,7 @@ class ApplicationHelper::Toolbar::DiagnosticsServerCenter < ApplicationHelper::T
       'pficon pficon-edit fa-lg',
       N_('Edit the Log Depot settings for the selected Server'),
       N_('Edit'),
-      :klass => ApplicationHelper::Button::DiagnosticsLogs),
+      :klass => ApplicationHelper::Button::LogDepotEdit),
     select(
       :restart_vmdb_choice,
       'fa fa-cog fa-lg',

diff --git a/app/helpers/application_helper/toolbar/diagnostics_zone_center.rb b/app/helpers/application_helper/toolbar/diagnostics_zone_center.rb
@@ -126,6 +126,6 @@ class ApplicationHelper::Toolbar::DiagnosticsZoneCenter < ApplicationHelper::Too
       'pficon pficon-edit fa-lg',
       N_('Edit the Log Depot settings for the selected Zone'),
       N_('Edit'),
-      :klass => ApplicationHelper::Button::ZoneLogDepotEdit),
+      :klass => ApplicationHelper::Button::LogDepotEdit),
   ])
 end
diff --git a/...n_helper/buttons/diagnostics_logs_spec.rb → ...ion_helper/buttons/log_depot_edit_spec.rb b/...n_helper/buttons/diagnostics_logs_spec.rb → ...ion_helper/buttons/log_depot_edit_spec.rb
@@ -1,4 +1,4 @@
-describe ApplicationHelper::Button::DiagnosticsLogs do
+describe ApplicationHelper::Button::LogDepotEdit do
   let(:view_context) { setup_view_context_with_sandbox(:active_tree => tree, :active_tab => tab) }
   let(:button) { described_class.new(view_context, {}, {}, {}) }
 

diff --git a/spec/helpers/application_helper/buttons/zone_log_depot_edit_spec.rb b/spec/helpers/application_helper/buttons/zone_log_depot_edit_spec.rb