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 2016/02/09 08:58:18 UTC
ignite git commit: IGNITE-843 Fixed validation.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 07ef27872 -> cb137aecd
IGNITE-843 Fixed validation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cb137aec
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cb137aec
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cb137aec
Branch: refs/heads/ignite-843-rc2
Commit: cb137aecdfb47717c7e3e8814f4df9d6bde32269
Parents: 07ef278
Author: vsisko <vs...@gridgain.com>
Authored: Tue Feb 9 14:58:20 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Feb 9 14:58:20 2016 +0700
----------------------------------------------------------------------
.../form-field-java-class/form-field-java-class.jade | 6 +++---
.../src/main/js/app/modules/form/field/input/number.jade | 4 ++--
.../src/main/js/controllers/caches-controller.js | 10 ----------
3 files changed, 5 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb137aec/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 3e5b1c4..ca8e6bb 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('javaKeywords', 'could not contains reserved Java keyword!')
- +feedback('javaBuiltInClass', 'should not be the Java built-in class!')
- +feedback('javaPackageSpecified', 'does not have package specified!')
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb137aec/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 b032c46..01d2b48 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
@@ -37,8 +37,8 @@ mixin feedback(error, message)
data-ng-model-options='{debounce: 150}'
)
- +feedback('min', 'Value is less than allowable minimum')
- +feedback('max', 'Value is more than allowable maximum')
+ +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')
span(ng-transclude='')
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb137aec/modules/control-center-web/src/main/js/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js
index 7b8055a..2f00dad 100644
--- a/modules/control-center-web/src/main/js/controllers/caches-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js
@@ -560,16 +560,6 @@ consoleModule.controller('cachesController', [
if (!item.readThrough && !item.writeThrough)
return showPopoverMessage($scope.ui, 'store', 'readThrough',
'Store is configured but read/write through are not enabled!');
-
- if (item.cacheStoreFactory.kind === 'CacheJdbcPojoStoreFactory') {
- if ($common.isDefined(item.domains)) {
- var domains = cacheDomains($scope.backupItem);
-
- if (_.findIndex(domains, $common.domainForStoreConfigured) < 0)
- return showPopoverMessage($scope.ui, 'general', 'domains',
- 'Cache with configured JDBC POJO store factory should be associated with at least one domain model for cache store', 10000);
- }
- }
}
if (item.writeBehindFlushSize === 0 && item.writeBehindFlushFrequency === 0)