ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [2/3] incubator-ignite git commit: # IGNITE-843 Cache template removed.
Date Fri, 19 Jun 2015 03:56:08 GMT
# IGNITE-843 Cache template removed.


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

Branch: refs/heads/ignite-843
Commit: d422b8b1d8c2253cb6178dc73fd32dcbe3c4f069
Parents: 37cf3b0
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Fri Jun 19 10:54:50 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Fri Jun 19 10:54:50 2015 +0700

----------------------------------------------------------------------
 .../nodejs/public/javascripts/controllers/caches.js         | 9 +--------
 modules/webconfig/nodejs/views/caches.jade                  | 4 +---
 2 files changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d422b8b1/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 83dd8b4..b5a048b 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
@@ -20,12 +20,6 @@ configuratorModule.controller('cachesController', ['$scope', '$alert',
'$http',
         $scope.addDetailSimpleItem = commonFunctions.addDetailSimpleItem;
         $scope.swapSimpleItems = commonFunctions.swapSimpleItems;
 
-        $scope.templates = [
-            {value: {mode: 'PARTITIONED', atomicityMode: 'ATOMIC'}, label: 'partitioned'},
-            {value: {mode: 'REPLICATED', atomicityMode: 'ATOMIC'}, label: 'replicated'},
-            {value: {mode: 'LOCAL', atomicityMode: 'ATOMIC'}, label: 'local'}
-        ];
-
         $scope.atomicities = [
             {value: 'ATOMIC', label: 'ATOMIC'},
             {value: 'TRANSACTIONAL', label: 'TRANSACTIONAL'}
@@ -87,8 +81,7 @@ configuratorModule.controller('cachesController', ['$scope', '$alert', '$http',
 
         // Add new cache.
         $scope.createItem = function() {
-            $scope.backupItem = angular.copy($scope.create.template);
-
+            $scope.backupItem = {mode: 'PARTITIONED', atomicityMode: 'ATOMIC'};
             $scope.backupItem.space = $scope.spaces[0]._id;
         };
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d422b8b1/modules/webconfig/nodejs/views/caches.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/caches.jade b/modules/webconfig/nodejs/views/caches.jade
index 6e42936..eb47351 100644
--- a/modules/webconfig/nodejs/views/caches.jade
+++ b/modules/webconfig/nodejs/views/caches.jade
@@ -33,9 +33,7 @@ block content
                     tr(ng-repeat='row in caches track by row._id')
                         td.col-sm-6(ng-class='{active: row._id == selectedItem._id}')
                             a(ng-click='selectItem(row)') {{$index + 1}}. {{row.name}}, {{row.mode
| displayValue:modes:'Cache mode not set'}}, {{row.atomicityMode | displayValue:atomicities:'Cache
atomicity not set'}}
-        button(ng-click='createItem()' class=['btn', 'btn-primary'] ng-disabled='!create.template')
&nbspAdd cache
-        span(style='margin-left: 15px; margin-right: 5px') Use template:&nbsp
-        button.btn.btn-default(ng-init='create.template = templates[0].value' ng-model='create.template'
data-template='/select' data-placeholder='Choose cache template' bs-options='item.value as
item.label for item in templates' bs-select)
+        button.btn.btn-primary(ng-click='createItem()') Add cache
         hr
         form.form-horizontal(name='cachesForm' ng-if='backupItem')
             div(bs-collapse data-start-collapsed='false')


Mime
View raw message