ignite git commit: IGNITE-843 Minor tweak.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 6945cfcf8 -> f6629cab8


IGNITE-843 Minor tweak.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f6629cab
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f6629cab
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f6629cab

Branch: refs/heads/ignite-843-rc2
Commit: f6629cab8134bd2e92b0d6adb0fb6744896602b1
Parents: 6945cfc
Author: Alexey Kuznetsov <akuznet...@apache.org>
Authored: Fri Jan 15 17:30:44 2016 +0700
Committer: Alexey Kuznetsov <akuznet...@apache.org>
Committed: Fri Jan 15 17:30:44 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/caches-controller.js    | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f6629cab/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 d3d5c2f..6d62f1a 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
@@ -171,8 +171,8 @@ consoleModule.controller('cachesController', [
             statistics: {xml: '', java: '', allDefaults: true}
         };
 
-        function _cacheLbl() {
-            return this.name + ', ' + _.result(_.find($scope.cacheModes, 
{value: this.cacheMode}), 'label') + ', ' + _.result(_.find($scope.atomicities, 
{value: this.atomicityMode}), 'label');
+        function _cacheLbl(cache) {
+            return cache.name + ', ' + cache.cacheMode + ', ' + 
cache.atomicityMode;
         }
 
         $scope.required = function (field) {
@@ -291,7 +291,7 @@ consoleModule.controller('cachesController', [
                 $scope.spaces = data.spaces;
 
                 data.caches.forEach(function (cache) {
-                    Object.defineProperty(cache, 'label', { get: _cacheLbl });
+                    cache.label = _cacheLbl(cache);
                 });
 
                 $scope.caches = data.caches;
@@ -453,7 +453,7 @@ consoleModule.controller('cachesController', [
         };
 
         function prepareNewItem(id) {
-            var newItem =  {
+            return {
                 space: $scope.spaces[0]._id,
                 cacheMode: 'PARTITIONED',
                 atomicityMode: 'ATOMIC',
@@ -465,10 +465,6 @@ consoleModule.controller('cachesController', [
                 metadatas: id && _.find($scope.metadatas, {value: id}) ? [id] 
: [],
                 cacheStoreFactory: {CacheJdbcBlobStoreFactory: {connectVia: 
'DataSource'}}
             };
-
-            Object.defineProperty(newItem, 'label', { get: _cacheLbl });
-
-            return newItem;
         }
 
         // Add new cache.
@@ -608,6 +604,8 @@ consoleModule.controller('cachesController', [
                 .success(function (_id) {
                     $scope.ui.markPristine();
 
+                    item.label = _cacheLbl(item);
+
                     var idx = _.findIndex($scope.caches, function (cache) {
                         return cache._id === _id;
                     });
@@ -657,8 +655,6 @@ consoleModule.controller('cachesController', [
 
                         item.name = newName;
 
-                        Object.defineProperty(item, 'label', { get: _cacheLbl 
});
-
                         save(item);
                     });
             }