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/06/23 11:20:47 UTC
[1/2] incubator-ignite git commit: # ignite-850 WIP session store.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 b9ace91dd -> 9970ed929
# ignite-850 WIP session store.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/02ce4484
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/02ce4484
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/02ce4484
Branch: refs/heads/ignite-843
Commit: 02ce44845f7446de1a857289c6ae6754b9174a7c
Parents: ba1bc7b
Author: Andrey <an...@gridgain.com>
Authored: Tue Jun 23 16:20:49 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Jun 23 16:20:49 2015 +0700
----------------------------------------------------------------------
.../webconfig/nodejs/public/javascripts/controllers/caches.js | 6 ++++++
.../nodejs/public/javascripts/controllers/clusters.js | 6 ++++++
modules/webconfig/nodejs/views/caches.jade | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02ce4484/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
index b5a1108..7c88722 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
@@ -79,6 +79,12 @@ configuratorModule.controller('cachesController', ['$scope', '$alert', '$http',
.success(function (data) {
$scope.spaces = data.spaces;
$scope.caches = data.caches;
+
+ $scope.backupItem = angular.fromJson(sessionStorage.backupItem);
+
+ $scope.$watch('backupItem', function (val) {
+ sessionStorage.backupItem = angular.toJson(val);
+ }, true);
});
$scope.selectItem = function (item) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02ce4484/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js b/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
index 15df43a..ce293ec 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
@@ -107,6 +107,12 @@ configuratorModule.controller('clustersController', ['$scope', '$alert', '$http'
$scope.caches = data.caches;
$scope.spaces = data.spaces;
$scope.clusters = data.clusters;
+
+ $scope.backupItem = angular.fromJson(sessionStorage.backupItem);
+
+ $scope.$watch('backupItem', function (val) {
+ sessionStorage.backupItem = angular.toJson(val);
+ }, true);
});
$scope.selectItem = function(item) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02ce4484/modules/webconfig/nodejs/views/caches.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/caches.jade b/modules/webconfig/nodejs/views/caches.jade
index c87293d..122db34 100644
--- a/modules/webconfig/nodejs/views/caches.jade
+++ b/modules/webconfig/nodejs/views/caches.jade
@@ -62,5 +62,5 @@ block content
.panel-title
h3
a(bs-collapse-toggle='0' ng-click='expanded = !expanded;') {{expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}}
- button.btn.btn-primary(ng-disabled='cachesForm.$invalid' ng-click='saveItem()') Save
+ button.btn.btn-primary(ng-disabled='inputForm.$invalid' ng-click='saveItem()') Save
button.btn.btn-primary.btn-second(ng-show='backupItem._id' ng-click='removeItem()') Remove
[2/2] incubator-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/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9970ed92
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9970ed92
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9970ed92
Branch: refs/heads/ignite-843
Commit: 9970ed929f5123600aa4d66634df58a0601f534e
Parents: 02ce448 b9ace91
Author: Andrey <an...@gridgain.com>
Authored: Tue Jun 23 16:21:01 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Jun 23 16:21:01 2015 +0700
----------------------------------------------------------------------
.../nodejs/public/form-models/caches.json | 38 +++++++++++++++++---
.../public/javascripts/controllers/caches.js | 9 +++++
2 files changed, 43 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9970ed92/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
----------------------------------------------------------------------