Merge pull request #12883 from hstastna/Alert_profiles_assignments

Change title in drop down menu for Alert profile assignments (cherry picked from commit 9baea51) https://bugzilla.redhat.com/show_bug.cgi?id=1402526
ManageIQ · Jan 9, 2017 · 3fdd689 · 3fdd689
1 parent 70fe4fd
commit 3fdd689
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/app/helpers/ui_constants.rb b/app/helpers/ui_constants.rb
@@ -447,12 +447,8 @@ module UiConstants
   # This set of assignments was created for miq_alerts
   ASSIGN_TOS["ExtManagementSystem"] = {
     "enterprise"                 => N_("The Enterprise"),
-    "ext_management_system"      => PostponedTranslation.new(N_("Selected %{tables}")) do
-                                      {:tables => ui_lookup(:tables => "ems_infra")}
-                                    end,
-    "ext_management_system-tags" => PostponedTranslation.new(N_("Tagged %{tables}")) do
-                                      {:tables => ui_lookup(:tables => "ems_infra")}
-                                    end
+    "ext_management_system"      => PostponedTranslation.new(N_("Selected Providers")),
+    "ext_management_system-tags" => PostponedTranslation.new(N_("Tagged Providers"))
   }
   ASSIGN_TOS["EmsCluster"] = {
     "ems_cluster"      => PostponedTranslation.new(N_("Selected %{tables}")) do

diff --git a/locale/en.yml b/locale/en.yml
@@ -969,8 +969,8 @@ en:
       network_port:                Network Port
       network_router:              Network Router
       evm_owner:                   EVM Owner
-      ext_management_system:       Cloud/Infrastructure Provider
-      ext_management_systems:      Cloud/Infrastructure Providers
+      ext_management_system:       Provider
+      ext_management_systems:      Providers
       filesystem_drivers:          File System Drivers
       filesystems:                 Files
       flavor:                      Flavor

diff --git a/spec/models/manageiq/providers/openstack/cloud_manager/auth_key_pair_spec.rb b/spec/models/manageiq/providers/openstack/cloud_manager/auth_key_pair_spec.rb
@@ -27,7 +27,7 @@
     it 'fails create with invalid parameters' do
       expect(subject.class.validate_create_key_pair(nil)).to eq(
         :available => false,
-        :message   => 'The Keypair is not connected to an active Cloud/Infrastructure Provider')
+        :message   => 'The Keypair is not connected to an active Provider')
     end
 
     it 'pass create with valid parameters' do