Hide the zone in the provider edit form if the provider is suspended

ManageIQ · Dec 19, 2018 · 6665066 · 6665066
1 parent 243b3fe
commit 6665066
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 5 deletions.
diff --git a/app/assets/javascripts/controllers/ems_common/ems_common_form_controller.js b/app/assets/javascripts/controllers/ems_common/ems_common_form_controller.js
@@ -117,6 +117,7 @@ ManageIQ.angular.app.controller('emsCommonFormController', ['$http', '$scope', '
       $scope.emsCommonModel.name                            = data.name;
       $scope.emsCommonModel.emstype                         = data.emstype;
       $scope.emsCommonModel.zone                            = data.zone;
+      $scope.emsCommonModel.zone_hidden                     = data.zone_hidden;
       $scope.emsCommonModel.tenant_mapping_enabled          = data.tenant_mapping_enabled;
       $scope.emsCommonModel.hostname                        = data.hostname;
       $scope.emsCommonModel.default_hostname                = data.default_hostname;

diff --git a/app/controllers/mixins/ems_common_angular.rb b/app/controllers/mixins/ems_common_angular.rb
@@ -370,6 +370,7 @@ def ems_form_fields
         render :json => {:name                            => @ems.name,
                          :emstype                         => @ems.emstype,
                          :zone                            => zone,
+                         :zone_hidden                     => zone == MiqRegion.my_region.maintenance_zone.name,
                          :tenant_mapping_enabled          => @ems.tenant_mapping_enabled == true,
                          :provider_id                     => @ems.provider_id || "",
                          :hostname                        => @ems.hostname,
@@ -410,6 +411,7 @@ def ems_form_fields
         render :json => { :name                          => @ems.name,
                           :emstype                       => @ems.emstype,
                           :zone                          => zone,
+                          :zone_hidden                   => zone == MiqRegion.my_region.maintenance_zone.name,
                           :provider_id                   => @ems.provider_id || "",
                           :default_hostname              => @ems.connection_configurations.default.endpoint.hostname,
                           :amqp_hostname                 => amqp_hostname,
@@ -455,6 +457,7 @@ def ems_form_fields
         render :json => {:name                                => @ems.name,
                          :emstype                             => @ems.emstype,
                          :zone                                => zone,
+                         :zone_hidden                         => zone == MiqRegion.my_region.maintenance_zone.name,
                          :hostname                            => @ems.hostname,
                          :default_hostname                    => @ems.connection_configurations.default.endpoint.hostname,
                          :default_api_port                    => @ems.connection_configurations.default.endpoint.port,

diff --git a/app/views/configuration_manager/_shared_form.html.haml b/app/views/configuration_manager/_shared_form.html.haml
@@ -23,7 +23,7 @@
                             "auto-focus"     => ""}
         %span.help-block{"ng-show" => "angularForm.name.$error.required"}
           = _("Required")
-    .form-group{"ng-class" => "{'has-error': angularForm.zone.$invalid}"}
+    .form-group{"ng-class" => "{'has-error': angularForm.zone.$invalid}", "ng-if" => "!emsCommonModel.zone_hidden"}
       %label.col-md-2.control-label{"for" => "prov_zone"}
         = _("Zone")
       .col-md-8

diff --git a/app/views/ems_container/_form.html.haml b/app/views/ems_container/_form.html.haml
@@ -41,7 +41,7 @@
                               "style"    => "color: black; font-weight: normal;"}
             = @emstype_display
 
-    .form-group{"ng-class" => "{'has-error': angularForm.zone.$invalid}"}
+    .form-group{"ng-class" => "{'has-error': angularForm.zone.$invalid}", "ng-if" => "!emsCommonModel.zone_hidden"}
       %label.col-md-2.control-label{"for" => "ems_zone"}
         = _("Zone")
       .col-md-4

diff --git a/app/views/ems_infra/_form.html.haml b/app/views/ems_infra/_form.html.haml
@@ -50,7 +50,7 @@
                      "checkchange"                 => "",
                      "selectpicker-for-select-tag" => "")
 
-    .form-group{"ng-class" => "{'has-error': angularForm.zone.$invalid}"}
+    .form-group{"ng-class" => "{'has-error': angularForm.zone.$invalid}", "ng-if" => "!emsCommonModel.zone_hidden"}
       %label.col-md-2.control-label{"for" => "ems_zone"}
         = _("Zone")
       .col-md-4

diff --git a/app/views/ems_physical_infra/_form.html.haml b/app/views/ems_physical_infra/_form.html.haml
@@ -40,7 +40,7 @@
                               "style"       => "color: black; font-weight: normal;"}
             = @emstype_display
 
-    .form-group{"ng-class" => "{'has-error': angularForm.zone.$invalid}"}
+    .form-group{"ng-class" => "{'has-error': angularForm.zone.$invalid}", "ng-if" => "!emsCommonModel.zone_hidden"}
       %label.col-md-2.control-label{"for" => "ems_zone"}
         = _("Zone")
       .col-md-8

diff --git a/app/views/shared/views/ems_common/angular/_form.html.haml b/app/views/shared/views/ems_common/angular/_form.html.haml
@@ -177,7 +177,7 @@
                      "checkchange"                 => "",
                      "selectpicker-for-select-tag" => "")
 
-    .form-group{"ng-class" => "{'has-error': angularForm.zone.$invalid}"}
+    .form-group{"ng-class" => "{'has-error': angularForm.zone.$invalid}", "ng-if" => "!emsCommonModel.zone_hidden"}
       %label.col-md-2.control-label{"for" => "ems_zone"}
         = _("Zone")
       .col-md-4

diff --git a/spec/controllers/ems_cloud_controller_spec.rb b/spec/controllers/ems_cloud_controller_spec.rb
@@ -144,6 +144,7 @@
     end
 
     it 'gets the ems cloud form fields on a get' do
+      Zone.seed
       post :create, :params => {
         "button"           => "add",
         "default_hostname" => "openstack.example.com",

diff --git a/spec/shared/controllers/shared_examples_for_ems_network_controller.rb b/spec/shared/controllers/shared_examples_for_ems_network_controller.rb
@@ -77,6 +77,7 @@
 
       describe "#ems_network_form_fields" do
         it "renders ems_network_form_fields json" do
+          Zone.seed
           get :ems_network_form_fields, :params => {:id => @ems.id}
           expect(response.status).to eq(200)
           expect(response.body).to_not be_empty