Merged Container Providers with all other providers in the list

Need to merge and keep all kind of providers under same entry to be able ot save chargeback assignments for different types of providers together. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1505335
h-kataria · Feb 2, 2018 · c3ea720 · c3ea720
1 parent e31deb7
commit c3ea720
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/app/controllers/chargeback_controller.rb b/app/controllers/chargeback_controller.rb
@@ -673,11 +673,9 @@ def cb_assign_set_form_vars
     @edit[:current_assignment] = ChargebackRate.get_assignments(x_node.split('-').last)
     unless @edit[:current_assignment].empty?
       @edit[:new][:cbshow_typ] =  case @edit[:current_assignment][0][:object]
-                                  when ManageIQ::Providers::ContainerManager
-                                    "ems_container"
                                   when EmsCluster
                                     "ems_cluster"
-                                  when ExtManagementSystem
+                                  when ExtManagementSystem, ManageIQ::Providers::ContainerManager
                                     "ext_management_system"
                                   when MiqEnterprise
                                     "enterprise"
@@ -784,9 +782,7 @@ def get_cis_all
       if klass == "enterprise"
         MiqEnterprise.all
       elsif klass == "ext_management_system"
-        ExtManagementSystem.all.reject { |prov| prov.kind_of? ManageIQ::Providers::ContainerManager }
-      elsif klass == "ems_container"
-        ManageIQ::Providers::ContainerManager.all
+        ExtManagementSystem.all
       else
         klass.classify.constantize.all
       end

diff --git a/app/helpers/term_of_service_helper.rb b/app/helpers/term_of_service_helper.rb
@@ -24,7 +24,6 @@ module TermOfServiceHelper
       "enterprise"    => N_("The Enterprise"),
       "storage"       => N_("Selected Datastores"),
       "storage-tags"  => N_("Tagged Datastores"),
-      "ems_container" => N_("Selected Containers Providers"),
       "tenant"        => N_("Tenants")
     },
     "MiqServer" => {
@@ -42,7 +41,6 @@ module TermOfServiceHelper
       "enterprise"             => N_("The Enterprise"),
       "ext_management_system"  => N_("Selected Providers"),
       "ems_cluster"            => N_("Selected Cluster / Deployment Roles"),
-      "ems_container"          => N_("Selected Containers Providers"),
       "vm-tags"                => N_("Tagged VMs and Instances"),
       "container_image-tags"   => N_("Tagged Container Images"),
       "container_image-labels" => N_("Labeled Container Images"),