You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2016/02/01 11:14:44 UTC
ignite git commit: IGNITE-843 Fixes in validation.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 f4fc002c4 -> 5f0e80d6c
IGNITE-843 Fixes in validation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5f0e80d6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5f0e80d6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5f0e80d6
Branch: refs/heads/ignite-843-rc2
Commit: 5f0e80d6c287023774df9ba213da57bd24e0285d
Parents: f4fc002
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Mon Feb 1 17:14:37 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Mon Feb 1 17:14:37 2016 +0700
----------------------------------------------------------------------
.../js/app/modules/Form/validator/java-identifier.directive.js | 2 +-
.../control-center-web/src/main/js/app/modules/JavaTypes/index.js | 2 +-
.../js/app/modules/states/configuration/clusters/deployment.jade | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5f0e80d6/modules/control-center-web/src/main/js/app/modules/Form/validator/java-identifier.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/Form/validator/java-identifier.directive.js b/modules/control-center-web/src/main/js/app/modules/Form/validator/java-identifier.directive.js
index b52115a..81a48a3 100644
--- a/modules/control-center-web/src/main/js/app/modules/Form/validator/java-identifier.directive.js
+++ b/modules/control-center-web/src/main/js/app/modules/Form/validator/java-identifier.directive.js
@@ -17,7 +17,7 @@
export default ['javaIdentifier', ['JavaTypes', (JavaTypes) => {
const link = (scope, el, attrs, [ngModel]) => {
- if (typeof attrs.validIdentifier === 'undefined' || !attrs.validIdentifier)
+ if (typeof attrs.javaIdentifier === 'undefined' || !attrs.javaIdentifier)
return;
ngModel.$validators.javaIdentifier = JavaTypes.validIdentifier;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5f0e80d6/modules/control-center-web/src/main/js/app/modules/JavaTypes/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/JavaTypes/index.js b/modules/control-center-web/src/main/js/app/modules/JavaTypes/index.js
index 56dd9dc..7b87ba7 100644
--- a/modules/control-center-web/src/main/js/app/modules/JavaTypes/index.js
+++ b/modules/control-center-web/src/main/js/app/modules/JavaTypes/index.js
@@ -51,7 +51,7 @@ angular
* @returns boolean 'true' if given text is valid Java package.
*/
validPackage(value) {
- const regexp = /^(([a-zA-Z_$][a-zA-Z0-9_$]*)\.)*([a-zA-Z_$][a-zA-Z0-9_$]*(\.[*]|[*])?)$/igm;
+ const regexp = /^(([a-zA-Z_$][a-zA-Z0-9_$]*)\.)*([a-zA-Z_$][a-zA-Z0-9_$]*(\.?\*)?)$/igm;
return value === '' || regexp.test(value);
},
http://git-wip-us.apache.org/repos/asf/ignite/blob/5f0e80d6/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 d563ee3..3f823f2 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
@@ -93,7 +93,7 @@ form.panel.panel-default(name='#{form}' novalidate)
data-ng-disabled='!#{enabled}'
)
.settings-row
- ignite-form-group(ng-init='__ = {};' ng-model='#{exclude}' ng-form='peerClassLoadingLocalClassPathExclude' )
+ ignite-form-group(ng-init='__ = {};' ng-model='#{exclude}' ng-form='#{form}' )
ignite-form-field-label
| Local class path exclude
ignite-form-group-tooltip