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/07/14 13:13:21 UTC
[1/2] incubator-ignite git commit: IGNITE-843 Fixed navbar visibility
when not logged.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 27c336970 -> c64b19e28
IGNITE-843 Fixed navbar visibility when not logged.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/78ce2a90
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/78ce2a90
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/78ce2a90
Branch: refs/heads/ignite-843
Commit: 78ce2a90c54e1802e1f64e6232b6995f36a1701c
Parents: 27c3369
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Jul 14 17:58:02 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Jul 14 17:58:02 2015 +0700
----------------------------------------------------------------------
modules/web-control-center/nodejs/views/includes/header.jade | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78ce2a90/modules/web-control-center/nodejs/views/includes/header.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/includes/header.jade b/modules/web-control-center/nodejs/views/includes/header.jade
index 47b9cfb..071c996 100644
--- a/modules/web-control-center/nodejs/views/includes/header.jade
+++ b/modules/web-control-center/nodejs/views/includes/header.jade
@@ -26,7 +26,7 @@ header.header(id='header')
h1.navbar-brand
a(href='/') Apache Ignite Web Configurator
.navbar-collapse.collapse(ng-controller='auth')
- ul.nav.navbar-nav(ng-controller='activeLink')
+ ul.nav.navbar-nav(ng-controller='activeLink' ng-show='user')
+header-item('/configuration', '/configuration/clusters', 'Configuration')
//+header-item('/monitoring', '/monitoring', 'Monitoring')
//+header-item('/sql', '/sql', 'SQL')
[2/2] incubator-ignite git commit: IGNITE-843 WIP on select first.
Posted by ak...@apache.org.
IGNITE-843 WIP on select first.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c64b19e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c64b19e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c64b19e2
Branch: refs/heads/ignite-843
Commit: c64b19e281b45385faf8aa2a75a816ec63276cd7
Parents: 78ce2a9
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Jul 14 18:13:20 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Jul 14 18:13:20 2015 +0700
----------------------------------------------------------------------
.../nodejs/controllers/caches-controller.js | 39 +++++++++++++-------
1 file changed, 26 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c64b19e2/modules/web-control-center/nodejs/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/caches-controller.js b/modules/web-control-center/nodejs/controllers/caches-controller.js
index 4564596..714ab43 100644
--- a/modules/web-control-center/nodejs/controllers/caches-controller.js
+++ b/modules/web-control-center/nodejs/controllers/caches-controller.js
@@ -85,6 +85,7 @@ controlCenterModule.controller('cachesController', ['$scope', '$http', 'commonFu
commonFunctions.showError(errMsg);
});
+ $scope.firstTime = true;
$scope.caches = [];
$scope.required = function (field) {
@@ -114,23 +115,36 @@ controlCenterModule.controller('cachesController', ['$scope', '$http', 'commonFu
$scope.spaces = data.spaces;
$scope.caches = data.caches;
- var restoredItem = angular.fromJson(sessionStorage.cacheBackupItem);
+ if ($scope.firstTime) {
+ console.log("firstTime");
+ $scope.firstTime = false;
- if (restoredItem && restoredItem._id) {
- var idx = _.findIndex($scope.caches, function (cache) {
- return cache._id == restoredItem._id;
- });
+ if ($scope.caches.length > 0)
+ $scope.selectItem($scope.caches[0]);
- if (idx >= 0) {
- $scope.selectedItem = $scope.caches[idx];
-
- $scope.backupItem = restoredItem;
+ sessionStorage.removeItem('cacheBackupItem');
+ }
+ else {
+ console.log("not firstTime");
+
+ var restoredItem = angular.fromJson(sessionStorage.cacheBackupItem);
+
+ if (restoredItem && restoredItem._id) {
+ var idx = _.findIndex($scope.caches, function (cache) {
+ return cache._id == restoredItem._id;
+ });
+
+ if (idx >= 0) {
+ $scope.selectedItem = $scope.caches[idx];
+ $scope.backupItem = restoredItem;
+ }
+ else
+ sessionStorage.removeItem('cacheBackupItem');
}
else
- sessionStorage.removeItem('cacheBackupItem');
+ $scope.backupItem = restoredItem;
+
}
- else
- $scope.backupItem = restoredItem;
$scope.$watch('backupItem', function (val) {
if (val)
@@ -143,7 +157,6 @@ controlCenterModule.controller('cachesController', ['$scope', '$http', 'commonFu
$scope.selectItem = function (item) {
$scope.selectedItem = item;
-
$scope.backupItem = angular.copy(item);
};