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 09:36:06 UTC
[1/2] ignite git commit: IGNITE-843 Fixed validation of indexed types.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 6a0f44fc0 -> 49f92ea00
IGNITE-843 Fixed validation of indexed types.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fc703eb0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fc703eb0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fc703eb0
Branch: refs/heads/ignite-843
Commit: fc703eb0d714eb91ae7178cf7c879e21c6f9a087
Parents: 839e791
Author: vsisko <vs...@gridgain.com>
Authored: Mon Sep 14 14:36:24 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Sep 14 14:36:24 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/caches-controller.js | 4 ++--
.../src/main/js/controllers/metadata-controller.js | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fc703eb0/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 55ab8cb..a0862ee 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
@@ -211,12 +211,12 @@ controlCenterModule.controller('cachesController', [
if ($common.isDefined(model)) {
var idx = _.findIndex(model, function (pair) {
- return pair.keyClass == pairValue.key
+ return pair.keyClass == pairValue.key && pair.valueClass == pairValue.value;
});
// Found duplicate.
if (idx >= 0 && idx != index)
- return showPopoverMessage(null, null, $table.tableFieldId(index, 'KeyIndexedType'), 'Indexed type with such key class already exists!');
+ return showPopoverMessage(null, null, $table.tableFieldId(index, 'ValueIndexedType'), 'Indexed type with such key and value classes already exists!');
}
return true;
http://git-wip-us.apache.org/repos/asf/ignite/blob/fc703eb0/modules/control-center-web/src/main/js/controllers/metadata-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
index c63c2fe..0a9b456 100644
--- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
@@ -683,7 +683,8 @@ controlCenterModule.controller('metadataController', [
$table.tableReset();
$timeout(function () {
- $common.ensureActivePanel($scope.panels, 'metadata', 'keyType');
+ $common.ensureActivePanel($scope.panels, 'query');
+ $common.ensureActivePanel($scope.panels, 'general', 'keyType');
});
$scope.selectItem(undefined, prepareNewItem());
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/49f92ea0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/49f92ea0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/49f92ea0
Branch: refs/heads/ignite-843
Commit: 49f92ea001f28ec8457b3e778c4d41e1e9f8bc18
Parents: fc703eb 6a0f44f
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Sep 14 14:36:49 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Sep 14 14:36:49 2015 +0700
----------------------------------------------------------------------
.../control-center-web/src/main/js/public/stylesheets/style.scss | 2 +-
.../control-center-web/src/main/js/views/includes/controls.jade | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------