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/09/23 05:45:49 UTC
[1/2] ignite git commit: # IGNITE-843 Fixed cluster search
Repository: ignite
Updated Branches:
refs/heads/ignite-843 7ab85d541 -> e18269083
# IGNITE-843 Fixed cluster search
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/46eefc9e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/46eefc9e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/46eefc9e
Branch: refs/heads/ignite-843
Commit: 46eefc9e9c89325bc2295b5f4aea29ad6a5de518
Parents: a17b30f
Author: Andrey <an...@gridgain.com>
Authored: Wed Sep 23 10:45:40 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Sep 23 10:45:40 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/46eefc9e/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 d90bb9b..cecfb26 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
@@ -1507,6 +1507,16 @@ controlCenterModule.filter('displayValue', function () {
});
controlCenterModule.filter('clustersSearch', function() {
+ var discoveries = {
+ 'Vm': 'static ips',
+ 'Multicast': 'multicast',
+ 'S3': 'aws s3',
+ 'Cloud': 'apache jclouds',
+ 'GoogleStorage': 'google cloud storage',
+ 'Jdbc': 'jdbc',
+ 'SharedFs': 'shared filesystem'
+ };
+
return function(array, query) {
if (!angular.isUndefined(array) && !angular.isUndefined(query) && !angular.isUndefined(query.$)) {
var filtredArray = [];
@@ -1514,7 +1524,7 @@ controlCenterModule.filter('clustersSearch', function() {
var matchString = query.$.toLowerCase();
angular.forEach(array, function (row) {
- var label = (row.name + ', ' + row.discovery.kind).toLowerCase();
+ var label = (row.name + ', ' + discoveries[row.discovery.kind]).toLowerCase();
if (label.indexOf(matchString) >= 0)
filtredArray.push(row);
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by an...@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/e1826908
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e1826908
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e1826908
Branch: refs/heads/ignite-843
Commit: e18269083e130ab0d852bc9f51d406d85d83f205
Parents: 46eefc9 7ab85d5
Author: Andrey <an...@gridgain.com>
Authored: Wed Sep 23 10:45:57 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Sep 23 10:45:57 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/admin-controller.js | 36 ++--
.../main/js/controllers/caches-controller.js | 114 +++++-------
.../main/js/controllers/clusters-controller.js | 112 +++++------
.../src/main/js/controllers/common-module.js | 185 ++++++++++---------
.../main/js/controllers/metadata-controller.js | 125 ++++++-------
.../main/js/controllers/profile-controller.js | 10 +-
.../src/main/js/controllers/sql-controller.js | 35 ++--
.../control-center-web/src/main/js/package.json | 14 +-
.../src/main/js/views/configuration/caches.jade | 2 +-
.../main/js/views/configuration/clusters.jade | 2 +-
.../main/js/views/configuration/metadata.jade | 2 +-
.../src/main/js/views/includes/controls.jade | 14 +-
.../src/main/js/views/sql/sql.jade | 9 +-
.../src/main/js/views/templates/confirm.jade | 6 +-
.../src/main/js/views/templates/layout.jade | 8 +-
15 files changed, 314 insertions(+), 360 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1826908/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------