Do not display the zone when editing a paused foreman/ansible prov

ManageIQ · Jan 30, 2019 · 0f86afd · 0f86afd
1 parent c748ab5
commit 0f86afd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/app/assets/javascripts/controllers/configuration_manager_form_controller.js b/app/assets/javascripts/controllers/configuration_manager_form_controller.js
@@ -47,6 +47,7 @@ ManageIQ.angular.app.controller('configurationManagerFormController', ['$http',
 
     vm.configurationManagerModel.name = data.name;
     vm.configurationManagerModel.zone = data.zone;
+    vm.configurationManagerModel.zone_hidden = data.zone_hidden;
     vm.configurationManagerModel.url = data.url;
     vm.configurationManagerModel.verify_ssl = data.verify_ssl === 1;
     vm.configurationManagerModel.default_userid = data.default_userid;

diff --git a/app/controllers/mixins/manager_controller_mixin.rb b/app/controllers/mixins/manager_controller_mixin.rb
@@ -287,6 +287,7 @@ def form_fields
 
       render :json => {:name                => provider.name,
                        :zone                => provider.zone.name,
+                       :zone_hidden         => !manager.enabled?,
                        :url                 => provider.url,
                        :verify_ssl          => provider.verify_ssl,
                        :default_userid      => provider.authentications.first.userid,
@@ -341,7 +342,7 @@ def sync_form_to_instance
       @provider.name       = params[:name]
       @provider.url        = params[:url]
       @provider.verify_ssl = params[:verify_ssl].eql?("on") || params[:verify_ssl].eql?("true")
-      @provider.zone       = Zone.find_by(:name => params[:zone].to_s)
+      @provider.zone       = Zone.find_by(:name => params[:zone].to_s) if params[:zone]
     end
 
     def provider_list(id, model)

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}", "ng-if" => "!emsCommonModel.zone_hidden"}
+    .form-group{"ng-class" => "{'has-error': angularForm.zone.$invalid}", "ng-if" => "!vm.configurationManagerModel.zone_hidden"}
       %label.col-md-2.control-label{"for" => "prov_zone"}
         = _("Zone")
       .col-md-8