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/01/22 08:40:25 UTC
[1/2] ignite git commit: IGNITE-2370 Minor fix for message
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 9ef6c9c9a -> 362b7dd7d
IGNITE-2370 Minor fix for message
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/34b3c4bf
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/34b3c4bf
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/34b3c4bf
Branch: refs/heads/ignite-843-rc2
Commit: 34b3c4bfb3d6379113d5bf8ea8fca76ddd2ec030
Parents: e967301
Author: vsisko <vs...@gridgain.com>
Authored: Fri Jan 22 14:39:48 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Jan 22 14:39:48 2016 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/caches-controller.js | 2 +-
.../src/main/js/controllers/clusters-controller.js | 2 +-
.../src/main/js/controllers/common-module.js | 10 +++-------
.../src/main/js/controllers/domains-controller.js | 1 -
4 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/34b3c4bf/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 f0732db..c7a7249 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
@@ -477,7 +477,7 @@ consoleModule.controller('cachesController', [
'Found caches "' + checkRes.firstCache.name + '" and "' + checkRes.secondCache.name + '" in cluster "' + failCluster.label + '" ' +
'with the same data source bean name "' + checkRes.firstCache.cacheStoreFactory[checkRes.firstCache.cacheStoreFactory.kind].dataSourceBean +
'" and different configured databases: "' + $common.cacheStoreJdbcDialectsLabel(checkRes.firstDB) + '" in "' + checkRes.firstCache.name + '" and "' +
- $common.cacheStoreJdbcDialectsLabel(checkRes.secondDB) + '" in "' + checkRes.secondCache.name + '"');
+ $common.cacheStoreJdbcDialectsLabel(checkRes.secondDB) + '" in "' + checkRes.secondCache.name + '"', 10000);
}
return true;
http://git-wip-us.apache.org/repos/asf/ignite/blob/34b3c4bf/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index 73f6f8c..8106ecc 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -469,7 +469,7 @@ consoleModule.controller('clustersController', function ($http, $timeout, $scope
'Found caches "' + checkRes.firstCache.name + '" and "' + checkRes.secondCache.name + '" ' +
'with the same data source bean name "' + checkRes.firstCache.cacheStoreFactory[checkRes.firstCache.cacheStoreFactory.kind].dataSourceBean +
'" and different configured databases: "' + $common.cacheStoreJdbcDialectsLabel(checkRes.firstDB) + '" in "' + checkRes.firstCache.name + '" and "' +
- $common.cacheStoreJdbcDialectsLabel(checkRes.secondDB) + '" in "' + checkRes.secondCache.name + '"');
+ $common.cacheStoreJdbcDialectsLabel(checkRes.secondDB) + '" in "' + checkRes.secondCache.name + '"', 10000);
}
var b = item.binaryConfiguration;
http://git-wip-us.apache.org/repos/asf/ignite/blob/34b3c4bf/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 ef460a1..32f72cb 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
@@ -586,9 +586,7 @@ consoleModule.service('$common', [
}
}
- function showPopoverMessage(panels, panelId, id, message) {
- popoverShown = false;
-
+ function showPopoverMessage(panels, panelId, id, message, showTime) {
ensureActivePanel(panels, panelId, id);
var el = $('body').find('#' + id);
@@ -602,7 +600,7 @@ consoleModule.service('$common', [
$timeout(function () { newPopover.$promise.then(newPopover.show); }, 400);
- $timeout(function () { newPopover.hide(); }, 5000);
+ $timeout(function () { newPopover.hide(); }, showTime ? showTime : 5000);
return false;
}
@@ -887,9 +885,7 @@ consoleModule.service('$common', [
return false;
},
- showPopoverMessage: function (panels, panelId, id, message) {
- return showPopoverMessage(panels, panelId, id, message);
- },
+ showPopoverMessage: showPopoverMessage,
hidePopover: function () {
if (popover)
popover.hide();
http://git-wip-us.apache.org/repos/asf/ignite/blob/34b3c4bf/modules/control-center-web/src/main/js/controllers/domains-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/domains-controller.js b/modules/control-center-web/src/main/js/controllers/domains-controller.js
index e638f32..201e71a 100644
--- a/modules/control-center-web/src/main/js/controllers/domains-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/domains-controller.js
@@ -907,7 +907,6 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
var dupSfx = (dup ? '_' + dupCnt : '');
-
newDomain.keyType = valType + 'Key' + dupSfx;
newDomain.valueType = valType + dupSfx;
newDomain.queryMetadata = 'Configuration';
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc2' into ignite-843-rc2
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/362b7dd7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/362b7dd7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/362b7dd7
Branch: refs/heads/ignite-843-rc2
Commit: 362b7dd7ded68c08a551e30a1cfa92fb5602ff12
Parents: 34b3c4b 9ef6c9c
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Jan 22 14:40:18 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Jan 22 14:40:18 2016 +0700
----------------------------------------------------------------------
.../src/main/js/app/modules/configuration/sidebar/main.js | 2 +-
.../src/main/js/views/configuration/caches.jade | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------