You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2018/11/20 14:55:16 UTC
[33/50] [abbrv] ignite git commit: IGNITE-9946 Web Console: Fixed
fields validation order.
IGNITE-9946 Web Console: Fixed fields validation order.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7da18645
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7da18645
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7da18645
Branch: refs/heads/ignite-10044
Commit: 7da186455f6fad9afd62be7f5802a4ee30667ef6
Parents: 7c632e6
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Tue Nov 20 14:13:48 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Nov 20 14:13:48 2018 +0700
----------------------------------------------------------------------
.../web-console/frontend/app/primitives/datepicker/index.pug | 6 +++---
.../frontend/app/primitives/form-field/dropdown.pug | 6 +++---
.../web-console/frontend/app/primitives/form-field/email.pug | 6 +++---
.../frontend/app/primitives/form-field/number.pug | 6 +++---
.../frontend/app/primitives/form-field/password.pug | 8 ++++----
.../web-console/frontend/app/primitives/form-field/phone.pug | 5 +++--
.../web-console/frontend/app/primitives/form-field/text.pug | 6 +++---
.../frontend/app/primitives/form-field/typeahead.pug | 6 +++---
.../web-console/frontend/app/primitives/timepicker/index.pug | 6 +++---
9 files changed, 28 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7da18645/modules/web-console/frontend/app/primitives/datepicker/index.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/datepicker/index.pug b/modules/web-console/frontend/app/primitives/datepicker/index.pug
index 28cd1a0..dd586dc 100644
--- 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
http://git-wip-us.apache.org/repos/asf/ignite/blob/7da18645/modules/web-console/frontend/app/primitives/form-field/dropdown.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/form-field/dropdown.pug b/modules/web-console/frontend/app/primitives/form-field/dropdown.pug
index 96d8482..b13a177 100644
--- 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
http://git-wip-us.apache.org/repos/asf/ignite/blob/7da18645/modules/web-console/frontend/app/primitives/form-field/email.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/form-field/email.pug b/modules/web-console/frontend/app/primitives/form-field/email.pug
index 5fb0c30..b1e1202 100644
--- 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
http://git-wip-us.apache.org/repos/asf/ignite/blob/7da18645/modules/web-console/frontend/app/primitives/form-field/number.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/form-field/number.pug b/modules/web-console/frontend/app/primitives/form-field/number.pug
index ea90709..dfcfff3 100644
--- 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
http://git-wip-us.apache.org/repos/asf/ignite/blob/7da18645/modules/web-console/frontend/app/primitives/form-field/password.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/form-field/password.pug b/modules/web-console/frontend/app/primitives/form-field/password.pug
index 374d768..5103281 100644
--- 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
http://git-wip-us.apache.org/repos/asf/ignite/blob/7da18645/modules/web-console/frontend/app/primitives/form-field/phone.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/form-field/phone.pug b/modules/web-console/frontend/app/primitives/form-field/phone.pug
index 9b60a40..4c79477 100644
--- 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!` })
http://git-wip-us.apache.org/repos/asf/ignite/blob/7da18645/modules/web-console/frontend/app/primitives/form-field/text.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/form-field/text.pug b/modules/web-console/frontend/app/primitives/form-field/text.pug
index ab8d14d..5a2595e 100644
--- 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
http://git-wip-us.apache.org/repos/asf/ignite/blob/7da18645/modules/web-console/frontend/app/primitives/form-field/typeahead.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/form-field/typeahead.pug b/modules/web-console/frontend/app/primitives/form-field/typeahead.pug
index b2c62ae..ee2312f 100644
--- 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
http://git-wip-us.apache.org/repos/asf/ignite/blob/7da18645/modules/web-console/frontend/app/primitives/timepicker/index.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/timepicker/index.pug b/modules/web-console/frontend/app/primitives/timepicker/index.pug
index f97a5a2..9a4dd97 100644
--- 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