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/25 11:07:53 UTC
[1/2] incubator-ignite git commit: # IGNITE-843 Fixed adding items to
simple-table.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 d05a1c883 -> 4d7ace586
# IGNITE-843 Fixed adding items to simple-table.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5eb66d6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5eb66d6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5eb66d6a
Branch: refs/heads/ignite-843
Commit: 5eb66d6a3e20362ab5187d327d938830bc690311
Parents: cb2c0d8
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Jun 25 16:07:02 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Jun 25 16:07:02 2015 +0700
----------------------------------------------------------------------
.../public/javascripts/controllers/caches.js | 12 +++++------
.../public/javascripts/controllers/common.js | 22 +++++++++++++-------
2 files changed, 21 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5eb66d6a/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 1ae5921..1f18e38 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
@@ -160,10 +160,10 @@ configuratorModule.controller('cachesController', ['$scope', '$alert', '$http',
var newItem = {keyClass: keyCls, valueClass: valCls};
- if (undefined == idxTypes)
- $scope.backupItem.indexedTypes = [newItem];
+ if (idxTypes)
+ idxTypes.push(newItem);
else
- idxTypes.push(newItem)
+ $scope.backupItem.indexedTypes = [newItem];
};
$scope.editIndexedTypes = function (idx) {
@@ -189,10 +189,10 @@ configuratorModule.controller('cachesController', ['$scope', '$alert', '$http',
if (idx < 0) {
var newItem = {keyClass: k, valueClass: v};
- if (undefined == idxTypes)
- $scope.backupItem.indexedTypes = [newItem];
- else
+ if (idxTypes)
idxTypes.push(newItem);
+ else
+ $scope.backupItem.indexedTypes = [newItem];
}
else {
var idxType = idxTypes[idx];
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5eb66d6a/modules/webconfig/nodejs/public/javascripts/controllers/common.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/common.js b/modules/webconfig/nodejs/public/javascripts/controllers/common.js
index a357c99..abc1289 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/common.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/common.js
@@ -20,20 +20,28 @@ var configuratorModule = angular.module('ignite-web-configurator', ['smart-tabl
configuratorModule.service('commonFunctions', function() {
return {
addSimpleItem: function(backupItem, mdl, item) {
- if (undefined == backupItem[mdl])
- backupItem[mdl] = [item];
- else
+ if (backupItem[mdl])
backupItem[mdl].push(item);
+ else
+ backupItem[mdl] = [item];
},
addDetailSimpleItem: function(backupItem, field, detailMdl, item) {
- var master = backupItem[field.group][backupItem[field.group][field.model]];
+ var fldGrp = field.group;
+ var fldMdl = field.model;
+ var master = backupItem[fldGrp][backupItem[fldGrp][fldMdl]];
+
+ if (!master) {
+ backupItem[fldGrp][backupItem[fldGrp][fldMdl]] = {};
+
+ master = backupItem[fldGrp][backupItem[fldGrp][fldMdl]];
+ }
var detailRows = master[detailMdl];
- if (undefined == detailRows)
- master[detailMdl] = [item];
- else
+ if (detailRows)
detailRows.push(item);
+ else
+ master[detailMdl] = [item];
},
swapSimpleItems: function(a, ix1, ix2) {
var tmp = a[ix1];
[2/2] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4d7ace58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4d7ace58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4d7ace58
Branch: refs/heads/ignite-843
Commit: 4d7ace5865678918386560572953b9731da61cbb
Parents: 5eb66d6 d05a1c8
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Jun 25 16:07:48 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Jun 25 16:07:48 2015 +0700
----------------------------------------------------------------------
.../public/javascripts/controllers/clusters.js | 21 +++------
.../nodejs/public/javascripts/dataStructures.js | 49 ++++++++++++++++++++
modules/webconfig/nodejs/utils/generatorJava.js | 35 +++++++++++++-
modules/webconfig/nodejs/utils/generatorXml.js | 41 +++++++++++++---
modules/webconfig/nodejs/views/layout.jade | 1 +
5 files changed, 126 insertions(+), 21 deletions(-)
----------------------------------------------------------------------