Merge pull request #3840 from mzazrivec/disable_embedded_ansible_cred…

…ential_form_when_manager_unavailable Disable credential / repository form when embedded ansible is unavailable
ManageIQ · Apr 26, 2018 · 6ee8f69 · 6ee8f69
2 parents 82a0615 + 5880a30
commit 6ee8f69
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 34 deletions.
diff --git a/...assets/javascripts/controllers/ansible_credentials/ansible_credentials_form_controller.js b/...assets/javascripts/controllers/ansible_credentials/ansible_credentials_form_controller.js
@@ -145,7 +145,12 @@ ManageIQ.angular.app.controller('ansibleCredentialsFormController', ['$window',
   }
 
   function setManagerResource(response) {
-    vm.credentialModel.manager_resource = { "href": response.resources[0].href };
+    if (response.resources.length > 0) {
+      vm.credentialModel.manager_resource = { "href": response.resources[0].href };
+    } else {
+      vm.credentialModel.manager_resource = null;
+      miqService.miqFlash('error', __('Embedded Ansible service is not available.'));
+    }
   }
 
   init();

diff --git a/app/assets/javascripts/controllers/ansible_repository/repository_form_controller.js b/app/assets/javascripts/controllers/ansible_repository/repository_form_controller.js
@@ -125,6 +125,7 @@ ManageIQ.angular.app.controller('repositoryFormController', ['repositoryId', 'mi
 
   var getManagerResource = function(response) {
     if (!response.resources.length) {
+      vm.repositoryModel.manager_resource = null;
       miqService.miqFlash('error', __('Embedded Ansible Provider not found.'));
     } else {
       vm.repositoryModel.manager_resource = {'href': response.resources[0].href};

diff --git a/app/views/ansible_credential/_credential_form.html.haml b/app/views/ansible_credential/_credential_form.html.haml
@@ -14,25 +14,27 @@
       %label.col-md-2.control-label
         = _('Name')
       .col-md-8
-        %input.form-control{:type        => "text",
-                            :name        => "name",
-                            "id"         => "name",
-                            'ng-model'   => "vm.credentialModel.name",
-                            :maxlength   => ViewHelper::MAX_NAME_LEN,
-                            :required    => true,
-                            "auto-focus" => ""}
+        %input.form-control{:type         => "text",
+                            :name         => "name",
+                            "id"          => "name",
+                            'ng-model'    => "vm.credentialModel.name",
+                            :maxlength    => ViewHelper::MAX_NAME_LEN,
+                            :required     => true,
+                            'ng-disabled' => 'vm.credentialModel.manager_resource === null',
+                            "auto-focus"  => ""}
         %span.help-block{"ng-show" => "angularForm.name.$error.required"}
           = _("Required")
     .form-group
       %label.col-md-2.control-label
         = _('Credential type')
       - if @id == 'new' # we don't allow changing auth. type when editing a resource
         .col-md-8
-          %select{'ng-model'   => 'vm.credentialModel.type',
-                  'ng-options' => 'cred.value as cred.label for cred in vm.select_options',
-                  'id'         => 'type',
-                  'required'   => 'true',
-                  'pf-select'  => 'true'}
+          %select{'ng-model'    => 'vm.credentialModel.type',
+                  'ng-options'  => 'cred.value as cred.label for cred in vm.select_options',
+                  'id'          => 'type',
+                  'ng-disabled' => 'vm.credentialModel.manager_resource === null',
+                  'required'    => 'true',
+                  'pf-select'   => 'true'}
       - else
         .col-md-8
           {{ vm.credential_options[vm.credentialModel.type].label }}

diff --git a/app/views/ansible_repository/_repository_form.html.haml b/app/views/ansible_repository/_repository_form.html.haml
@@ -15,22 +15,24 @@
       %label.col-md-2.control-label
         = _('Name')
       .col-md-8
-        %input.form-control{:type          => "text",
-                            :name        => "name",
-                            "id"         => "name",
-                            'ng-model'   => "vm.repositoryModel.name",
-                            :maxlength   => ViewHelper::MAX_NAME_LEN,
-                            :required    => ""}
+        %input.form-control{:type         => "text",
+                            :name         => "name",
+                            "id"          => "name",
+                            'ng-model'    => "vm.repositoryModel.name",
+                            'ng-disabled' => 'vm.repositoryModel.manager_resource === null',
+                            :maxlength    => ViewHelper::MAX_NAME_LEN,
+                            :required     => ""}
         %span.help-block{"ng-show" => "angularForm.name.$error.required"}
           = _("Required")
     .form-group
       %label.col-md-2.control-label
         = _('Description')
       .col-md-8
-        %input.form-control{:type        => "text",
-                            :name        => "description",
-                            "id"         => "description",
-                            'ng-model'   => "vm.repositoryModel.description"}
+        %input.form-control{:type         => "text",
+                            :name         => "description",
+                            "id"          => "description",
+                            'ng-disabled' => 'vm.repositoryModel.manager_resource === null',
+                            'ng-model'    => "vm.repositoryModel.description"}
     .form-group
       %label.col-md-2.control-label
         = _('SCM type')
@@ -49,6 +51,7 @@
                             :id              => "scm_url",
                             'ng-model'       => "vm.repositoryModel.scm_url",
                             :required        => "",
+                            'ng-disabled'    => 'vm.repositoryModel.manager_resource === null',
                             'url-validation' => true}
         %span.help-block{"ng-show" => "angularForm.scm_url.$error.required"}
           = _("Required")
@@ -58,33 +61,35 @@
       %label.col-md-2.control-label
         = _('SCM credentials')
       .col-md-8
-        %select{'name'       => 'authentication_id',
-                'ng-model'   => 'vm.repositoryModel.authentication_id',
-                'ng-options' => 'scm_credential.value as scm_credential.name for scm_credential in vm.scm_credentials',
-                'pf-select'  => true}
+        %select{'name'        => 'authentication_id',
+                'ng-model'    => 'vm.repositoryModel.authentication_id',
+                'ng-options'  => 'scm_credential.value as scm_credential.name for scm_credential in vm.scm_credentials',
+                'ng-disabled' => 'vm.repositoryModel.manager_resource === null',
+                'pf-select'   => true}
     .form-group
       %label.col-md-2.control-label
         = _('SCM Branch')
       .col-md-8
-        %input.form-control{:type        => "text",
-                            :name        => "scm_branch",
-                            "id"         => "scm_branch",
-                            'ng-model'   => "vm.repositoryModel.scm_branch"}
+        %input.form-control{:type         => "text",
+                            :name         => "scm_branch",
+                            "id"          => "scm_branch",
+                            'ng-disabled' => 'vm.repositoryModel.manager_resource === null',
+                            'ng-model'    => "vm.repositoryModel.scm_branch"}
     .form-group
       %label.col-md-2.control-label
         = _('SCM Update Options')
       .col-md-8
         %div
           %label
-            = check_box_tag("clean", "1", false, 'ng-model' => "vm.repositoryModel.scm_clean")
+            = check_box_tag("clean", "1", false, 'ng-model' => "vm.repositoryModel.scm_clean", 'ng-disabled' => 'vm.repositoryModel.manager_resource === null')
             = _('Clean')
         %div
           %label
-            = check_box_tag("scm_delete_on_update", "1", false, 'ng-model' => 'vm.repositoryModel.scm_delete_on_update')
+            = check_box_tag("scm_delete_on_update", "1", false, 'ng-model' => 'vm.repositoryModel.scm_delete_on_update', 'ng-disabled' => 'vm.repositoryModel.manager_resource === null')
             = _('Delete on Update')
         %div
           %label
-            = check_box_tag("scm_update_on_launch", "1", false, 'ng-model' => 'vm.repositoryModel.scm_update_on_launch')
+            = check_box_tag("scm_update_on_launch", "1", false, 'ng-model' => 'vm.repositoryModel.scm_update_on_launch', 'ng-disabled' => 'vm.repositoryModel.manager_resource === null')
             = _('Update on Launch')
     = render :partial => 'layouts/angular/generic_form_buttons'
 :javascript