Merge pull request #378 from ZitaNemeckova/missed_ontap_delete

Delete ::Settings.product.storage in textual_group_list
ManageIQ · Feb 14, 2017 · 72e35ee · 72e35ee
2 parents e51ac7b + 6cb56a4
commit 72e35ee
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/app/controllers/ems_cluster_controller.rb b/app/controllers/ems_cluster_controller.rb
@@ -182,7 +182,7 @@ def button
 
   def textual_group_list
     [
-      %i(relationships) + (::Settings.product.storage ? storage_relationships : []),
+      %i(relationships),
       %i(host_totals vm_totals configuration tags openstack_status)
     ]
   end

diff --git a/app/controllers/host_controller.rb b/app/controllers/host_controller.rb
@@ -572,11 +572,10 @@ def host_form_fields
   def textual_group_list
     [
       %i(properties relationships),
-      (::Settings.product.storage ? %i(storage_relationships) : []) +
-        %i(
-          compliance security configuration diagnostics smart_management miq_custom_attributes
-          ems_custom_attributes authentications cloud_services openstack_hardware_status openstack_service_status
-        )
+      %i(
+        compliance security configuration diagnostics smart_management miq_custom_attributes
+        ems_custom_attributes authentications cloud_services openstack_hardware_status openstack_service_status
+      )
     ]
   end
   helper_method :textual_group_list

diff --git a/app/controllers/storage_controller.rb b/app/controllers/storage_controller.rb
@@ -614,8 +614,7 @@ def storage_scan
   def textual_group_list
     [
       %i(properties registered_vms relationships),
-      (::Settings.product.storage ? %i(storage_relationships) : []) +
-        %i(content smart_management)
+      %i(content smart_management)
     ]
   end
   helper_method :textual_group_list

diff --git a/app/controllers/vm_common.rb b/app/controllers/vm_common.rb
@@ -5,9 +5,7 @@ module VmCommon
 
   def textual_group_list
     [
-      %i(properties lifecycle relationships) +
-        (::Settings.product.storage ? %i(storage_relationships) : []) +
-        %i(vmsafe normal_operating_ranges miq_custom_attributes ems_custom_attributes),
+      %i(properties lifecycle relationships vmsafe normal_operating_ranges miq_custom_attributes ems_custom_attributes),
       %i(compliance power_management security configuration datastore_allocation datastore_usage diagnostics tags)
     ]
   end