You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/07/15 21:17:06 UTC
[18/45] incubator-ignite git commit: IGNITE-843 Fixed initial state
for readFromBackup and copyOnRead.
IGNITE-843 Fixed initial state for readFromBackup and copyOnRead.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1f2d370e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1f2d370e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1f2d370e
Branch: refs/heads/ignite-1121
Commit: 1f2d370e7309ab18eeab8d186b090c70908d9e2f
Parents: 5b960ed
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Jul 14 17:16:12 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Jul 14 17:16:12 2015 +0700
----------------------------------------------------------------------
.../nodejs/controllers/caches-controller.js | 2 +-
.../nodejs/controllers/models/caches.json | 21 +++++++++++---------
.../nodejs/views/includes/controls.jade | 2 +-
3 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f2d370e/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 a17557e..8fdbc70 100644
--- a/modules/web-control-center/nodejs/controllers/caches-controller.js
+++ b/modules/web-control-center/nodejs/controllers/caches-controller.js
@@ -149,7 +149,7 @@ controlCenterModule.controller('cachesController', ['$scope', '$http', 'commonFu
// Add new cache.
$scope.createItem = function () {
- $scope.backupItem = {mode: 'PARTITIONED', atomicityMode: 'ATOMIC', readFromBackup: true};
+ $scope.backupItem = {mode: 'PARTITIONED', atomicityMode: 'ATOMIC'};
$scope.backupItem.space = $scope.spaces[0]._id;
};
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f2d370e/modules/web-control-center/nodejs/controllers/models/caches.json
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/models/caches.json b/modules/web-control-center/nodejs/controllers/models/caches.json
index 251c431..a83085d 100644
--- a/modules/web-control-center/nodejs/controllers/models/caches.json
+++ b/modules/web-control-center/nodejs/controllers/models/caches.json
@@ -53,12 +53,24 @@
"label": "Read from backup",
"type": "check",
"model": "readFromBackup",
+ "checked": true,
+ "hide": "!backupItem.backups",
"tip": [
"Flag indicating whether data can be read from backup.",
"If not set then always get data from primary node (never from backup)."
]
},
{
+ "label": "Copy on read",
+ "type": "check",
+ "model": "copyOnRead",
+ "checked": true,
+ "tip": [
+ "Flag indicating whether copy of of the value stored in cache should be created for cache operation implying return value.",
+ "Also if this flag is set copies are created for values passed to CacheInterceptor and to CacheEntryProcessor."
+ ]
+ },
+ {
"label": "Invalidate near cache",
"type": "check",
"model": "invalidate",
@@ -305,15 +317,6 @@
"tip": [
"Flag indicating whether swap storage is enabled or not for this cache."
]
- },
- {
- "label": "Copy on read",
- "type": "check",
- "model": "copyOnRead",
- "tip": [
- "Flag indicating whether copy of of the value stored in cache should be created for cache operation implying return value.",
- "Also if this flag is set copies are created for values passed to CacheInterceptor and to CacheEntryProcessor."
- ]
}
]
},
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f2d370e/modules/web-control-center/nodejs/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/includes/controls.jade b/modules/web-control-center/nodejs/views/includes/controls.jade
index 409f52f..2b79208 100644
--- a/modules/web-control-center/nodejs/views/includes/controls.jade
+++ b/modules/web-control-center/nodejs/views/includes/controls.jade
@@ -102,7 +102,7 @@ mixin form-row
div(ng-switch='field.type')
div.checkbox.col-sm-6(ng-switch-when='check' ng-hide=fieldHide)
label
- input(type='checkbox')&attributes(fieldCommon)
+ input(type='checkbox' ng-checked='#{fieldMdl} = field.checked')&attributes(fieldCommon)
| {{field.label}}
+tipLabel('field.tip')
div(ng-switch-when='text' ng-hide=fieldHide)