Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CD8DA18D1E for ; Tue, 16 Feb 2016 15:14:19 +0000 (UTC) Received: (qmail 20764 invoked by uid 500); 16 Feb 2016 15:14:19 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 20619 invoked by uid 500); 16 Feb 2016 15:14:19 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 20324 invoked by uid 99); 16 Feb 2016 15:14:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Feb 2016 15:14:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AB7E2E0B37; Tue, 16 Feb 2016 15:14:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Date: Tue, 16 Feb 2016 15:14:33 -0000 Message-Id: <7f11d7e3a64643779d81ac5fad435e0d@git.apache.org> In-Reply-To: <3a6f4de9cda14be4a4bb9e1e35c6f064@git.apache.org> References: <3a6f4de9cda14be4a4bb9e1e35c6f064@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/50] ignite git commit: IGNITE-843 Fixed feedback IGNITE-843 Fixed feedback Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/60330c8f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/60330c8f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/60330c8f Branch: refs/heads/ignite-843-rc3 Commit: 60330c8f8647e25b72db2ddc950800e543843e85 Parents: 053ba44 Author: Andrey Authored: Mon Feb 15 17:43:40 2016 +0700 Committer: Andrey Committed: Mon Feb 15 17:43:40 2016 +0700 ---------------------------------------------------------------------- .../form-field-java-class.jade | 10 +++++----- .../js/app/modules/form/field/input/number.jade | 2 +- .../states/configuration/clusters/deployment.jade | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/60330c8f/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade index ca8e6bb..d8e5162 100644 --- a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade +++ b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade @@ -46,8 +46,8 @@ div ) span(ng-transclude) - +feedback('javaPackageSpecified', 'does not have package specified!') - +feedback('javaBuiltInClass', 'should not be the Java built-in class!') - +feedback('javaKeywords', 'could not contains reserved Java keyword!') - +feedback('javaIdentifier', 'is invalid Java identifier!') - +feedback('required', 'could not be empty!') + +feedback('javaPackageSpecified', 'does not have package specified') + +feedback('javaBuiltInClass', 'should not be the Java built-in class') + +feedback('javaKeywords', 'could not contains reserved Java keyword') + +feedback('javaIdentifier', 'is invalid Java identifier') + +feedback('required', 'could not be empty') http://git-wip-us.apache.org/repos/asf/ignite/blob/60330c8f/modules/control-center-web/src/main/js/app/modules/form/field/input/number.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/form/field/input/number.jade b/modules/control-center-web/src/main/js/app/modules/form/field/input/number.jade index 01d2b48..6b31ebd 100644 --- a/modules/control-center-web/src/main/js/app/modules/form/field/input/number.jade +++ b/modules/control-center-web/src/main/js/app/modules/form/field/input/number.jade @@ -39,6 +39,6 @@ mixin feedback(error, message) +feedback('min', 'Value is less than allowable minimum: {{ min || 0 }}') +feedback('max', 'Value is more than allowable maximum: {{ max }}') - +feedback('number', 'Invalid value. Only numbers allowed') + +feedback('number', 'Only numbers allowed') span(ng-transclude='') http://git-wip-us.apache.org/repos/asf/ignite/blob/60330c8f/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade index 2f8ce0f..adf7fb7 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade +++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade @@ -144,10 +144,10 @@ form.panel.panel-default(name='#{form}' novalidate) data-title='Click icon or press [Enter] to save item' ) - +feedback(field, 'required', 'Package name could not be empty!') - +feedback(field, 'javaPackageName', 'Package name is invalid!') - +feedback(field, 'javaKeywords', 'Package name could not contains reserved java keyword: ""!') - +feedback(field, 'igniteUnique', 'Such package already exists!') + +feedback(field, 'required', 'Package name could not be empty') + +feedback(field, 'javaPackageName', 'Package name is invalid') + +feedback(field, 'javaKeywords', 'Package name could not contains reserved java keyword') + +feedback(field, 'igniteUnique', 'Such package already exists') - var field = 'new' - var valid = form + '.' + field + '.$valid' @@ -175,10 +175,10 @@ form.panel.panel-default(name='#{form}' novalidate) data-title='Click icon or press [Enter] to save item' ) - +feedback(field, 'required', 'Package name could not be empty!') - +feedback(field, 'javaPackageName', 'Package name is invalid!') - +feedback(field, 'javaKeywords', 'Package name could not contains reserved java keyword: ""!') - +feedback(field, 'igniteUnique', 'Such package already exists!') + +feedback(field, 'required', 'Package name could not be empty') + +feedback(field, 'javaPackageName', 'Package name is invalid') + +feedback(field, 'javaKeywords', 'Package name could not contains reserved java keyword') + +feedback(field, 'igniteUnique', 'Such package already exists') .group-content-empty(ng-if='!(#{exclude}.length) && !group.add.length') | Not defined