IGNITE-9946 Web Console: Fixed fields validation order.

gridgain · Nov 20, 2018 · 7da1864 · 7da1864
1 parent 7c632e6
commit 7da1864
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 27 deletions.
diff --git a/modules/web-console/frontend/app/primitives/datepicker/index.pug b/modules/web-console/frontend/app/primitives/datepicker/index.pug
@@ -58,8 +58,8 @@ mixin form-field__datepicker({ label, model, name, mindate, maxdate, minview = 1
             ng-messages=`$input.$error`
             ng-show=`($input.$dirty || $input.$touched || $input.$submitted) && $input.$invalid`
         )
-            if block
-                block
-
             if required
                 +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` })
+
+            if block
+                block
diff --git a/modules/web-console/frontend/app/primitives/form-field/dropdown.pug b/modules/web-console/frontend/app/primitives/form-field/dropdown.pug
@@ -50,8 +50,8 @@ mixin form-field__dropdown({ label, model, name, disabled, required, multiple, p
             ng-messages=`$input.$error`
             ng-show=`($input.$dirty || $input.$touched || $input.$submitted) && $input.$invalid`
         )
-            if block
-                block
-
             if required
                 +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` })
+
+            if block
+                block
diff --git a/modules/web-console/frontend/app/primitives/form-field/email.pug b/modules/web-console/frontend/app/primitives/form-field/email.pug
@@ -29,10 +29,10 @@ mixin form-field__email({ label, model, name, disabled, required, placeholder, t
             ng-messages=`$input.$error`
             ng-show=`($input.$dirty || $input.$touched || $input.$submitted) && $input.$invalid`
         )
-            if block
-                block
-
             if required
                 +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` })
 
             +form-field__error({ error: 'email', message: `${errLbl} has invalid format!` })
+
+            if block
+                block
diff --git a/modules/web-console/frontend/app/primitives/form-field/number.pug b/modules/web-console/frontend/app/primitives/form-field/number.pug
@@ -33,9 +33,6 @@ mixin form-field__number({ label, model, name, disabled, required, placeholder,
             ng-messages=`$input.$error`
             ng-show=`($input.$dirty || $input.$touched || $input.$submitted) && $input.$invalid`
         )
-            if block
-                block
-
             if required
                 +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` })
 
@@ -46,3 +43,6 @@ mixin form-field__number({ label, model, name, disabled, required, placeholder,
             +form-field__error({ error: 'step', message: `${errLbl} step should be ${step || 1}` })
 
             +form-field__error({ error: 'number', message: 'Only numbers allowed' })
+
+            if block
+                block
diff --git a/modules/web-console/frontend/app/primitives/form-field/password.pug b/modules/web-console/frontend/app/primitives/form-field/password.pug
@@ -44,10 +44,10 @@ mixin form-field__password({ label, model, name, disabled, required, placeholder
                 ($input2.$dirty || $input2.$touched || $input2.$submitted) && $input2.$invalid
             `
         )
-            if block
-                block
-
             if required
                 +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` })
-                
+
             +form-field__error({ error: 'mismatch', message: `Password does not match the confirm password!` })
+
+            if block
+                block
diff --git a/modules/web-console/frontend/app/primitives/form-field/phone.pug b/modules/web-console/frontend/app/primitives/form-field/phone.pug
@@ -29,8 +29,9 @@ mixin form-field__phone({ label, model, name, disabled, required, optional, plac
             ng-messages=`$input.$error`
             ng-show=`($input.$dirty || $input.$touched || $input.$submitted) && $input.$invalid`
         )
+            if required
+                +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` })
+
             if block
                 block
 
-            if required
-                +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` })
diff --git a/modules/web-console/frontend/app/primitives/form-field/text.pug b/modules/web-console/frontend/app/primitives/form-field/text.pug
@@ -29,8 +29,8 @@ mixin form-field__text({ label, model, name, disabled, required, placeholder, ti
             ng-messages=`$input.$error`
             ng-show=`($input.$dirty || $input.$touched || $input.$submitted) && $input.$invalid`
         )
-            if block
-                block
-
             if required
                 +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` })
+
+            if block
+                block
diff --git a/modules/web-console/frontend/app/primitives/form-field/typeahead.pug b/modules/web-console/frontend/app/primitives/form-field/typeahead.pug
@@ -48,8 +48,8 @@ mixin form-field__typeahead({ label, model, name, disabled, required, placeholde
             ng-messages=`$input.$error`
             ng-show=`($input.$dirty || $input.$touched || $input.$submitted) && $input.$invalid`
         )
-            if block
-                block
-
             if required
                 +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` })
+
+            if block
+                block
diff --git a/modules/web-console/frontend/app/primitives/timepicker/index.pug b/modules/web-console/frontend/app/primitives/timepicker/index.pug
@@ -56,8 +56,8 @@ mixin form-field__timepicker({ label, model, name, mindate, maxdate, disabled, r
             ng-messages=`$input.$error`
             ng-show=`($input.$dirty || $input.$touched || $input.$submitted) && $input.$invalid`
         )
-            if block
-                block
-
             if required
                 +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` })
+
+            if block
+                block