Repository: ignite Updated Branches: refs/heads/ignite-843 abbc8a23f -> 120c11cf7
IGNITE-843 WIP preview. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/120c11cf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/120c11cf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/120c11cf Branch: refs/heads/ignite-843 Commit: 120c11cf76b1201f9048ae7f2ffc38d22cb650d6 Parents: abbc8a2 Author: AKuznetsov <[email protected]> Authored: Tue Aug 25 21:27:53 2015 +0700 Committer: AKuznetsov <[email protected]> Committed: Tue Aug 25 21:27:53 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/models/caches.json | 7 +++++ .../main/js/routes/generator/generator-xml.js | 28 +++++++++++--------- 2 files changed, 22 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/120c11cf/modules/control-center-web/src/main/js/controllers/models/caches.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/models/caches.json b/modules/control-center-web/src/main/js/controllers/models/caches.json index d5d27a4..7a45b93 100644 --- a/modules/control-center-web/src/main/js/controllers/models/caches.json +++ b/modules/control-center-web/src/main/js/controllers/models/caches.json @@ -119,6 +119,7 @@ { "label": "Memory", "id": "memory-data", + "preview": "memory", "tip": [ "Cache memory settings." ], @@ -318,6 +319,7 @@ { "label": "Queries & Indexing", "id": "queriesAndIndexing-data", + "preview": "query", "tip": [ "Cache query settings." ], @@ -396,6 +398,7 @@ { "label": "Store", "id": "store-data", + "preview": "store", "tip": [ "Cache store settings." ], @@ -674,6 +677,7 @@ { "label": "Concurrency control", "id": "concurrency-data", + "preview": "concurrency", "tip": [ "Cache concurrent usage settings." ], @@ -718,6 +722,7 @@ { "label": "Rebalance", "id": "rebalance-data", + "preview": "rebalance", "hide": "backupItem.cacheMode == 'LOCAL'", "tip": [ "Cache rebalance settings." @@ -799,6 +804,7 @@ { "label": "Server near cache", "id": "serverNearCache-data", + "preview": "serverNearCache", "hide": "backupItem.cacheMode != 'PARTITIONED'", "tip": [ "Near cache settings.", @@ -965,6 +971,7 @@ { "label": "Statistics", "id": "statistics-data", + "preview": "statistics", "tip": [ "Cache statistics and management settings." ], http://git-wip-us.apache.org/repos/asf/ignite/blob/120c11cf/modules/control-center-web/src/main/js/routes/generator/generator-xml.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js index 444f239..2695813 100644 --- a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js +++ b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js @@ -143,7 +143,7 @@ function _addBeanWithProperties(res, bean, beanPropName, beanClass, props, creat function _createEvictionPolicy(res, evictionPolicy, propertyName) { if (evictionPolicy && evictionPolicy.kind) { - var e = $generatorCommon.evictionPolicies[evictionPolicy.kind]; + var e = $generatorCommon.EVICTION_POLICIES[evictionPolicy.kind]; var obj = evictionPolicy[evictionPolicy.kind.toUpperCase()]; @@ -682,22 +682,24 @@ $generatorXml.cacheStore = function(cache, res) { if (cache.cacheStoreFactory && cache.cacheStoreFactory.kind) { var storeFactory = cache.cacheStoreFactory[cache.cacheStoreFactory.kind]; - var storeFactoryDesc = $generatorCommon.STORE_FACTORIES[cache.cacheStoreFactory.kind]; + if (storeFactory) { + var storeFactoryDesc = $generatorCommon.STORE_FACTORIES[cache.cacheStoreFactory.kind]; - _addBeanWithProperties(res, storeFactory, 'cacheStoreFactory', storeFactoryDesc.className, storeFactoryDesc.fields, true); + _addBeanWithProperties(res, storeFactory, 'cacheStoreFactory', storeFactoryDesc.className, storeFactoryDesc.fields, true); - if (storeFactory.dialect) { - if (_.findIndex(res.datasources, function (ds) { - return ds.dataSourceBean == storeFactory.dataSourceBean; - }) < 0) { - res.datasources.push({ - dataSourceBean: storeFactory.dataSourceBean, - className: $generatorCommon.DATA_SOURCES[storeFactory.dialect] - }); + if (storeFactory.dialect) { + if (_.findIndex(res.datasources, function (ds) { + return ds.dataSourceBean == storeFactory.dataSourceBean; + }) < 0) { + res.datasources.push({ + dataSourceBean: storeFactory.dataSourceBean, + className: $generatorCommon.DATA_SOURCES[storeFactory.dialect] + }); + } } - } - res.needEmptyLine = true; + res.needEmptyLine = true; + } } _addProperty(res, cache, 'loadPreviousValue');
