Merge pull request #514 from h-kataria/catalog_item_fixes

Fixed 'Catalog' should not be a required field
ManageIQ · Mar 2, 2017 · 4cd4b34 · 4cd4b34
2 parents 06a0c52 + 185a24d
commit 4cd4b34
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/app/views/catalog/_st_angular_form.html.haml b/app/views/catalog/_st_angular_form.html.haml
@@ -47,7 +47,7 @@
                             "switch-off-text" => "No",
                             "checkchange" => ""}
 
-    .form-group{"ng-class" => "{'has-error': vm.catalogItemModel.display && angularForm.catalog_id.$invalid}"}
+    .form-group
       %label.col-md-2.control-label{"for" => "catalog_id"}
         = _('Catalog')
       .col-md-8
@@ -58,9 +58,7 @@
                 "data-live-search" => "true",
                 'pf-select'        => true}
           %option{"value" => ""}
-            = "<#{_('Choose')}>"
-        %span.help-block{"ng-show" => "catalogItemModel.display"}
-          = _("Required")
+            = "<#{_('Unassigned')}>"
 
   = render :partial => "layouts/angular/multi_tab_ansible_form_options",
            :locals  => {:record => @record, :ng_model => "vm.catalogItemModel"}

diff --git a/app/views/layouts/angular/_ansible_form_options_angular.html.haml b/app/views/layouts/angular/_ansible_form_options_angular.html.haml
@@ -168,32 +168,34 @@
       %label.col-md-3.control-label
         = _("Dialog")
       .col-md-3
-        .radio
+        %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'"}
           = _("Use Existing")
-        .radio
+      .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",
+                "name"             => "#{prefix}_dialog_id",
+                'ng-options'       => 'dialog as dialog.label for dialog in vm.dialogs',
+                "ng-required"      => "vm.fieldsRequired('#{prefix}') && #{ng_model}.#{prefix}_dialog_existing == 'existing'",
+                :checkchange       => true,
+                "data-live-search" => "true",
+                'pf-select'        => true}
+          %option{"value" => ""}
+            = "<#{_('Choose')}>"
+          %span.help-block{"ng-show" => "angularForm.#{prefix}_dialog_id.$error.$invalid"}
+            = _("Required")  
+
+    .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'")}
           = _("Create New")
-      .col-md-4
-        .form-group{"ng-class" => "{'has-error': angularForm.#{prefix}_dialog_id.$invalid}", "ng-if" => "#{ng_model}.#{prefix}_dialog_existing == 'existing'"}
-          %select{"ng-model"         => "vm._#{prefix}_dialog",
-                  "name"             => "#{prefix}_dialog_id",
-                  'ng-options'       => 'dialog as dialog.label for dialog in vm.dialogs',
-                  "ng-required"      => "vm.fieldsRequired('#{prefix}') && #{ng_model}.#{prefix}_dialog_existing == 'existing'",
-                  :checkchange       => true,
-                  "data-live-search" => "true",
-                  'pf-select'        => true}
-            %option{"value" => ""}
-              = "<#{_('Choose')}>"
-            %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         => "vm.#{prefix}_dialog_name",
-                              :maxlength    => 50,
-                              "ng-required" => "vm.fieldsRequired('#{prefix}') && #{ng_model}.#{prefix}_dialog_existing == 'create'",
-                              "checkchange" => ""}
-            %span.help-block{"ng-show" => "angularForm.#{prefix}_dialog_name.$error.$invalid"}
-              = _("Required")
+      .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",
+                            'ng-model'    => "#{ng_model}.#{prefix}_dialog_name",
+                            :name         => "vm.#{prefix}_dialog_name",
+                            :maxlength    => 50,
+                            "ng-required" => "vm.fieldsRequired('#{prefix}') && #{ng_model}.#{prefix}_dialog_existing == 'create'",
+                            "checkchange" => ""}
+          %span.help-block{"ng-show" => "angularForm.#{prefix}_dialog_name.$error.$invalid"}
+            = _("Required")