From 7b7f01c47753d7c57eb6e3597a719c429c39eb4a Mon Sep 17 00:00:00 2001 From: L Galis Date: Thu, 10 May 2018 14:31:28 -0400 Subject: [PATCH] Mark dialog selection as a required field --- .../controllers/catalog/catalog_item_form_controller.js | 2 +- .../angular/_ansible_form_options_angular.html.haml | 8 ++++---- 2 files changed, 5 insertions(+), 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 index 91c29a3b70d..ac3e8567488 100644 --- 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 index c6289020998..68a7eeeba34 100644 --- a/app/views/layouts/angular/_ansible_form_options_angular.html.haml +++ b/app/views/layouts/angular/_ansible_form_options_angular.html.haml @@ -261,12 +261,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", @@ -281,11 +281,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",