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/09/14 08:28:29 UTC
ignite git commit: IGNITE-843 Fixed metadata validation.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 1a5de0092 -> 839e791e3
IGNITE-843 Fixed metadata validation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/839e791e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/839e791e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/839e791e
Branch: refs/heads/ignite-843
Commit: 839e791e3aa6c4e78dddfe26719ed11d5f1b82c6
Parents: 1a5de00
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Sep 14 13:29:09 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Sep 14 13:29:09 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/839e791e/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index 6d58fb7..08106d1 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -614,19 +614,21 @@ controlCenterModule.service('$common', [
return true;
},
metadataForQueryConfigured: function (meta) {
- return isDefined(meta)
- && !(isEmptyArray(meta.queryFields)
+ var isEmpty = !isDefined(meta) || (isEmptyArray(meta.queryFields)
&& isEmptyArray(meta.ascendingFields)
&& isEmptyArray(meta.descendingFields)
&& isEmptyArray(meta.textFields)
- && isEmptyArray(meta.groups))
+ && isEmptyArray(meta.groups));
+
+ return !isEmpty;
},
metadataForStoreConfigured: function (meta) {
- return isDefined(meta)
- && !(isEmptyString(meta.databaseSchema)
+ var isEmpty = !isDefined(meta) || (isEmptyString(meta.databaseSchema)
&& isEmptyString(meta.databaseTable)
&& isEmptyArray(meta.keyFields)
- && isEmptyArray(meta.valueFields))
+ && isEmptyArray(meta.valueFields));
+
+ return !isEmpty;
},
/**
* Cut class name by width in pixel or width in symbol count.