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/06/10 12:21:57 UTC
[3/3] incubator-ignite git commit: # IGNITE-843 Wip on cache indexed
types.
# IGNITE-843 Wip on cache indexed types.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/80ba59c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/80ba59c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/80ba59c0
Branch: refs/heads/ignite-843
Commit: 80ba59c0d3756c6c3a4267be983398e22877a19a
Parents: b418a79
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Jun 10 17:21:49 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Jun 10 17:21:49 2015 +0700
----------------------------------------------------------------------
modules/webconfig/nodejs/db.js | 2 +-
.../public/javascripts/controllers/caches.js | 3 ++-
.../webconfig/nodejs/views/includes/controls.jade | 17 +++++++----------
3 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80ba59c0/modules/webconfig/nodejs/db.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/db.js b/modules/webconfig/nodejs/db.js
index de51fd5..9b933f7 100644
--- a/modules/webconfig/nodejs/db.js
+++ b/modules/webconfig/nodejs/db.js
@@ -105,7 +105,7 @@ var CacheSchema = new Schema({
sqlEscapeAll: Boolean,
sqlOnheapRowCacheSize: Boolean,
longQueryWarningTimeout: Number,
- indexedTypes: [String],
+ indexedTypes: [{keyClass: String, valueClass: String}],
sqlFunctionClasses: [String],
statisticsEnabled: Boolean,
managementEnabled: Boolean,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80ba59c0/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 81ebfe1..fd28c1f 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
@@ -17,7 +17,8 @@
configuratorModule.controller('cachesController', ['$scope', '$modal', '$http', function($scope, $modal, $http) {
$scope.templates = [
- {value: {mode: 'PARTITIONED', atomicityMode: 'ATOMIC'}, label: 'Partitioned'},
+ {value: {mode: 'PARTITIONED', atomicityMode: 'ATOMIC',
+ indexedTypes: [{keyClass: 'org.some.KeyClass', valueClass: 'org.some.ValueClass'},{keyClass: 'org.some.KeyClass2', valueClass: 'org.some.ValueClass2'}]}, label: 'Partitioned'},
{value: {mode: 'REPLICATED', atomicityMode: 'ATOMIC'}, label: 'Replicated'},
{value: {mode: 'LOCAL', atomicityMode: 'ATOMIC'}, label: 'Local'}
];
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80ba59c0/modules/webconfig/nodejs/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/includes/controls.jade b/modules/webconfig/nodejs/views/includes/controls.jade
index cd52dca..9f76751 100644
--- a/modules/webconfig/nodejs/views/includes/controls.jade
+++ b/modules/webconfig/nodejs/views/includes/controls.jade
@@ -102,18 +102,15 @@ mixin form-row
+details-row
div(ng-switch-when='indexedTypes')
div
- label Indexed types: 2
- button.btn.btn-primary(ng-click='editIndexedTypes()') Add indexed type
+ label Indexed types: {{backupItem.indexedTypes.length}}
+ button.btn.btn-primary(style='margin-left: 10px' ng-click='editIndexedTypes()') Add indexed type
+tip
.col-sm-10.links(style='margin-left: 18px')
- table
+ -var idxTypes = 'backupItem.indexedTypes'
+ table(st-table=idxTypes)
tbody
- tr
- td
- a 1. o.a.s.other.package.KeyClazz1, o.a.s.other.package.ValueClazz1
- label.fa.fa-remove
- tr
+ tr(ng-repeat='idxType in #{idxTypes}')
td
- a 2. org.apache.some.KeyClazz2, og.a.s.v.v.long.package.ValueClazz3
- label.fa.fa-remove
+ a {{$index + 1}}. {{idxType.keyClass}}, {{idxType.valueClass}}
+ label.fa.fa-remove(style='margin-left: 10px')