ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-843 WIP on preview.
Date Tue, 25 Aug 2015 09:14:33 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 0582c6005 -> a35325c85


IGNITE-843 WIP on preview.


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

Branch: refs/heads/ignite-843
Commit: a35325c854862ae56fff02fc6245ac34f6476d01
Parents: 0582c60
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Tue Aug 25 16:14:56 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Tue Aug 25 16:14:56 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/routes/generator/generator-xml.js       | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a35325c8/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 563b4c5..869d0f8 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
@@ -38,12 +38,12 @@ function _escapeAttr(s) {
 }
 
 function _addProperty(res, obj, propName, setterName) {
-    var val = obj[propName];
-
-    if ($commonUtils.isDefined(val))
-        _addElement(res, 'property', 'name', setterName ? setterName : propName, 'value',
_escapeAttr(val));
+    if ($commonUtils.isDefined(obj)) {
+        var val = obj[propName];
 
-    return val;
+        if ($commonUtils.isDefined(val))
+            _addElement(res, 'property', 'name', setterName ? setterName : propName, 'value',
_escapeAttr(val));
+    }
 }
 
 function _addClassNameProperty(res, obj, propName) {
@@ -51,8 +51,6 @@ function _addClassNameProperty(res, obj, propName) {
 
     if ($commonUtils.isDefined(val))
         _addElement(res, 'property', 'name', propName, 'value', $generatorCommon.javaBuildInClass(val));
-
-    return val;
 }
 
 function _addListProperty(res, obj, propName, listType, rowFactory) {


Mime
View raw message