ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [23/29] ignite git commit: IGNITE-843 Fixed project structure file duplicates.
Date Fri, 12 Feb 2016 09:54:49 GMT
IGNITE-843 Fixed project structure file duplicates.


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

Branch: refs/heads/ignite-843-rc3
Commit: f44993eff678466ccd477c84d39756dcb4674fc8
Parents: 0ee811c
Author: Vasiliy Sisko <vsisko@gridgain.com>
Authored: Fri Feb 12 16:25:50 2016 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Fri Feb 12 16:25:50 2016 +0700

----------------------------------------------------------------------
 .../modules/states/configuration/summary/summary.controller.js  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f44993ef/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
index 46d9f0d..1e487a3 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
@@ -148,7 +148,7 @@ export default [
             let children = null;
 
             if (!_.isEmpty(node.children)) {
-                children = _.find(node.children, {name: leaf});
+                children = _.find(node.children, {type: 'folder', name: leaf});
 
                 if (children)
                     return getOrCreateFolder(children, path);
@@ -170,7 +170,8 @@ export default [
 
             const folder = getOrCreateFolder(javaFolder, path);
 
-            folder.children.push({type: 'file', name: shortClsName});
+            if (!_.find(folder.children, {type: 'file', name: shortClsName}))
+                folder.children.push({type: 'file', name: shortClsName});
         }
 
         $scope.selectItem = (cluster) => {


Mime
View raw message