renamed function name 'repositoryRequired' to 'fieldsRequired'

Made changes to mark fields on Provisioning tab as required fields, fields on Retirement tab are not required for now. https://www.pivotaltracker.com/story/show/138302747
ManageIQ · Feb 10, 2017 · 1a2a3cd · 1a2a3cd
1 parent b926bd2
commit 1a2a3cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 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
@@ -226,7 +226,7 @@ ManageIQ.angular.app.controller('catalogItemFormController', ['$scope', 'catalog
     $scope.catalogItemModel[prefix + "_dialog_existing"] = selected_value
   };
 
-  $scope.repositoryRequired = function(prefix) {
+  $scope.fieldsRequired = function(prefix) {
     return prefix == "provisioning";
   };
 

diff --git a/app/views/layouts/angular/_ansible_form_options_angular.html.haml b/app/views/layouts/angular/_ansible_form_options_angular.html.haml
@@ -8,7 +8,7 @@
         %select{"ng-model"    => "_#{prefix}_repository",
                 "name"        => "#{prefix}_repository_id",
                 'ng-options'  => 'repository as repository.name for repository in repositories',
-                "ng-required" => "repositoryRequired('#{prefix}')",
+                "ng-required" => "fieldsRequired('#{prefix}')",
                 'ng_change'   => "repository_changed()",
                 'pf-select'   => true}
           %option{"value" => ""}
@@ -163,22 +163,20 @@
           %select{"ng-model"    => "_#{prefix}_dialog",
                   "name"        => "#{prefix}_dialog_id",
                   'ng-options'  => 'dialog as dialog.label for dialog in dialogs',
-                  "ng-required" => "#{ng_model}.#{prefix}_dialog_existing == 'existing'",
-                  :miqrequired  => true,
+                  "ng-required" => "fieldsRequired('#{prefix}') && #{ng_model}.#{prefix}_dialog_existing == 'existing'",
                   :checkchange  => true,
                   'pf-select'   => true}
             %option{"value" => ""}
               = "<#{_('Choose')}>"
-            %span.help-block{"ng-show" => "angularForm.#{prefix}_dialog_id.$error.miqrequired"}
+            %span.help-block{"ng-show" => "angularForm.#{prefix}_dialog_id.$error.$invalid"}
               = _("Required")
 
         .form-group{"ng-class" => "{'has-error': angularForm.#{prefix}_dialog_name.$invalid}", "ng-if" => "#{ng_model}.#{prefix}_dialog_existing == 'create'"}
           %input.form-control{:type         => "text",
                               'ng-model'    => "#{ng_model}.#{prefix}_dialog_name",
                               :name         => "#{prefix}_dialog_name",
                               :maxlength    => 50,
-                              "ng-required" => "#{ng_model}.#{prefix}_dialog_existing == 'create'",
-                              "miqrequired" => "",
+                              "ng-required" => "fieldsRequired('#{prefix}') && #{ng_model}.#{prefix}_dialog_existing == 'create'",
                               "checkchange" => ""}
-            %span.help-block{"ng-show" => "angularForm.#{prefix}_dialog_name.$error.miqrequired"}
+            %span.help-block{"ng-show" => "angularForm.#{prefix}_dialog_name.$error.$invalid"}
               = _("Required")