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 2015/11/05 11:53:30 UTC
[2/2] ignite git commit: IGNITE-843 Bug fix.
IGNITE-843 Bug fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa2e2fc1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa2e2fc1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa2e2fc1
Branch: refs/heads/ignite-843-rc1
Commit: fa2e2fc1b6eaf0f648bbba8ff4d6317334a7b38f
Parents: e3e7b5d
Author: Andrey <an...@gridgain.com>
Authored: Thu Nov 5 17:53:22 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Nov 5 17:53:22 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 20 ++++++++++++++++++++
.../main/js/controllers/metadata-controller.js | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa2e2fc1/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 71ed69d..6f71b3d 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
@@ -1675,6 +1675,26 @@ consoleModule.filter('tablesSearch', function() {
}
});
+consoleModule.filter('igfssSearch', function() {
+ return function(array, query) {
+ if (!angular.isUndefined(array) && !angular.isUndefined(query) && !angular.isUndefined(query.$)) {
+ var filtredArray = [];
+
+ var matchString = query.$.toLowerCase();
+
+ angular.forEach(array, function (row) {
+ var label = row.name.toLowerCase();
+
+ if (label.indexOf(matchString) >= 0)
+ filtredArray.push(row);
+ });
+
+ return filtredArray;
+ } else
+ return array;
+ }
+});
+
// Filter metadata with key fields configuration.
consoleModule.filter('metadatasValidation', ['$common', function ($common) {
return function(metadatas, valid, invalid) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa2e2fc1/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 4d16ea8..9c46a6d 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
@@ -832,7 +832,7 @@ consoleModule.controller('metadataController', [
if (indexes && indexes.length > 0) {
_.forEach(indexes, function(index) {
if ($common.isEmptyArray(index.fields))
- return showPopoverMessage($scope.panels, 'query', 'indexes' + i, 'Group fields are not specified');
+ return showPopoverMessage($scope.panels, 'query', 'indexes' + index, 'Group fields are not specified');
});
}
}