Merge pull request ManageIQ#13394 from isimluk/perf_capture_enabled

Simplify ems.perf_capture_enabled
mskantar · Jan 30, 2017 · 4240b7c · 4240b7c
2 parents 2b9a6c3 + 684450b
commit 4240b7c
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/app/models/ext_management_system.rb b/app/models/ext_management_system.rb
@@ -516,9 +516,7 @@ def perf_rollup_parents(interval_name = nil)
 
   def perf_capture_enabled?
     return @perf_capture_enabled unless @perf_capture_enabled.nil?
-    return @perf_capture_enabled = true if ems_clusters.any?(&:perf_capture_enabled?)
-    return @perf_capture_enabled = true if hosts.any?(&:perf_capture_enabled?)
-    @perf_capture_enabled = false
+    @perf_capture_enabled = ems_clusters.any?(&:perf_capture_enabled?) || host.any?(&:perf_capture_enabled?)
   end
   alias_method :perf_capture_enabled, :perf_capture_enabled?
   Vmdb::Deprecation.deprecate_methods(self, :perf_capture_enabled => :perf_capture_enabled?)