You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/12/16 09:19:22 UTC
[28/28] ignite git commit: IGNITE-843 Minor.
IGNITE-843 Minor.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b6ec7660
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b6ec7660
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b6ec7660
Branch: refs/heads/ignite-843-rc2
Commit: b6ec76605c196d6a64b492a52582f29e7b2b2870
Parents: 981ea7d
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Dec 16 15:19:37 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Dec 16 15:19:37 2015 +0700
----------------------------------------------------------------------
.../control-center-web/src/main/js/views/includes/controls.jade | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b6ec7660/modules/control-center-web/src/main/js/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade
index 230b599..ac155f7 100644
--- a/modules/control-center-web/src/main/js/views/includes/controls.jade
+++ b/modules/control-center-web/src/main/js/views/includes/controls.jade
@@ -143,8 +143,7 @@ mixin details-row(lblClasses, fieldClasses)
- var lblDetailClasses = lblClasses + ' details-label'
- var detailMdl = 'getModel(backupItem, detail)[detail.model]';
- - var detailCommon = {'ng-model': detailMdl, 'ng-required': 'detail.required'};
- - var detailDisabled = '{{detail.disabled}}'
+ - var detailCommon = {'ng-model': detailMdl, 'ng-required': '{{detail.required}}', 'ng-disabled': '{{detail.disabled}}'};
- var dropdownPlaceholder = {'ng-class': '{placeholder: !(' + detailMdl + ' && ' + detailMdl + '.length > 0)}'}
- var customValidators = {'ng-attr-ipaddress': '{{detail.ipaddress}}'}
@@ -168,7 +167,7 @@ mixin details-row(lblClasses, fieldClasses)
.div(class=fieldClasses)
+tipField('detail.tip')
.input-tip
- input.form-control(id='{{::detail.id}}' name='{{detail.model}}' type='number' ng-disabled=detailDisabled placeholder='{{::detail.placeholder}}' min='{{detail.min ? detail.min : 0}}' max='{{detail.max ? detail.max : Number.MAX_VALUE}}')&attributes(detailCommon)
+ input.form-control(id='{{::detail.id}}' name='{{detail.model}}' type='number' placeholder='{{::detail.placeholder}}' min='{{detail.min ? detail.min : 0}}' max='{{detail.max ? detail.max : Number.MAX_VALUE}}')&attributes(detailCommon)
+ico-exclamation('{{detail.model}}', 'min', 'Value is less than allowable minimum.')
+ico-exclamation('{{detail.model}}', 'max', 'Value is more than allowable maximum.')
+ico-exclamation('{{detail.model}}', 'number', 'Invalid value. Only numbers allowed.')