Merge pull request #3926 from lgalis/dialog_flag_required_for_playboo…

…k_catalog Selection of a dialog is required for a playbook catalog item (cherry picked from commit 8c5aca4) https://bugzilla.redhat.com/show_bug.cgi?id=1578976
ManageIQ · May 16, 2018 · 7d5f48c · 7d5f48c
1 parent 74e3547
commit 7d5f48c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/assets/javascripts/controllers/catalog/catalog_item_form_controller.js b/app/assets/javascripts/controllers/catalog/catalog_item_form_controller.js
@@ -17,7 +17,7 @@ ManageIQ.angular.app.controller('catalogItemFormController', ['$scope', 'catalog
       provisioning_vault_credential_id: '',
       provisioning_execution_ttl: '',
       provisioning_inventory: 'localhost',
-      provisioning_dialog_existing: '',
+      provisioning_dialog_existing: 'existing',
       provisioning_dialog_id: '',
       provisioning_dialog_name: '',
       provisioning_key: '',

diff --git a/app/views/layouts/angular/_ansible_form_options_angular.html.haml b/app/views/layouts/angular/_ansible_form_options_angular.html.haml
@@ -262,12 +262,12 @@
                       %span{:class => "pficon pficon-delete"}
 
     - if prefix == "provisioning"
-      .form-group{"ng-if" =>"#{ng_model}.#{prefix}_dialog_existing!==undefined"}
+      .form-group
         %label.col-md-3.control-label
           = _("Dialog")
         .col-md-3
           %label.radio-inline
-            %input{"ng-model" => "vm.#{prefix}_dialog_existing", :type => "radio", :value => "existing", "ng-click" => "vm.toggleDialogSelection('#{prefix}', 'existing')", "ng-checked" => "#{ng_model}.#{prefix}_dialog_existing == 'existing'"}
+            %input{"ng-model" => "vm.#{prefix}_dialog_existing", :type => "radio", :value => "existing", "ng-value" => "existing", "ng-click" => "vm.toggleDialogSelection('#{prefix}', 'existing')", "ng-checked" => "#{ng_model}.#{prefix}_dialog_existing == 'existing'"}
             = _("Use Existing")
         .col-md-6{"ng-class" => "{'has-error': angularForm.#{prefix}_dialog_id.$invalid}", "ng-if" => "#{ng_model}.#{prefix}_dialog_existing == 'existing'"}
           %select{"ng-model"         => "vm._#{prefix}_dialog",
@@ -282,11 +282,11 @@
             %span.help-block{"ng-show" => "angularForm.#{prefix}_dialog_id.$error.$invalid"}
               = _("Required")
 
-      .form-group{"ng-if" =>"#{ng_model}.#{prefix}_dialog_existing!==undefined"}
+      .form-group
         %label.col-md-3.control-label
         .col-md-3
           %label.radio-inline
-            %input{"ng-model" => "vm.#{prefix}_dialog_existing", :type => "radio", :value => "create", "ng-click" => "vm.toggleDialogSelection('#{prefix}', 'create')", "ng-checked" => ("#{ng_model}.#{prefix}_dialog_existing == 'create'")}
+            %input{"ng-model" => "vm.#{prefix}_dialog_existing", :type => "radio", :value => "create", :ng-value => "create", "ng-click" => "vm.toggleDialogSelection('#{prefix}', 'create')", "ng-checked" => ("#{ng_model}.#{prefix}_dialog_existing == 'create'")}
             = _("Create New")
         .col-md-6{"ng-class" => "{'has-error': angularForm.#{prefix}_dialog_name.$invalid}", "ng-if" => "#{ng_model}.#{prefix}_dialog_existing == 'create'"}
           %input.form-control{:type         => "text",