From: Stanislav Jamrich Date: Tue, 16 Aug 2016 14:16:10 +0000 (+0200) Subject: Yangutils - uses statement can be root X-Git-Tag: release/carbon~37 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=25abfdb8a160194ba5327241b97207eea0baf482;p=dlux.git Yangutils - uses statement can be root - Bug https://bugs.opendaylight.org/show_bug.cgi?id=6440 Change-Id: Ib9e9783b6be5853196749ea6bd4418f9c048a7ba Signed-off-by: Stanislav Jamrich --- diff --git a/modules/common-yangutils-resources/src/main/resources/yangutils/services/module-connector.services.js b/modules/common-yangutils-resources/src/main/resources/yangutils/services/module-connector.services.js index 4c505322..43837b09 100644 --- a/modules/common-yangutils-resources/src/main/resources/yangutils/services/module-connector.services.js +++ b/modules/common-yangutils-resources/src/main/resources/yangutils/services/module-connector.services.js @@ -47,7 +47,12 @@ define([], function () { changed = false; if (node && module) { - usesNode.parent.children.splice(usesNode.parent.children.indexOf(usesNode), 1); // delete uses node + if (usesNode.parent.children) { // if parent is node + usesNode.parent.children.splice(usesNode.parent.children.indexOf(usesNode), 1); // delete uses node + } + else if (usesNode.parent._roots) { // if parent is module + usesNode.parent._roots.splice(usesNode.parent._roots.indexOf(usesNode), 1); + } for (var i = 0; i < node.children.length; i++) { applyLinks(node.children[i], module, modules); } diff --git a/modules/common-yangutils-resources/src/main/resources/yangutils/services/node-utils.services.js b/modules/common-yangutils-resources/src/main/resources/yangutils/services/node-utils.services.js index c16a5b8b..120921eb 100644 --- a/modules/common-yangutils-resources/src/main/resources/yangutils/services/node-utils.services.js +++ b/modules/common-yangutils-resources/src/main/resources/yangutils/services/node-utils.services.js @@ -12,7 +12,7 @@ define([], function () { // TODO: add service's description function isRootNode(type) { - return type === 'container' || type === 'list' || type === 'rpc'; + return type === 'container' || type === 'list' || type === 'uses' || type === 'rpc'; } // TODO: add service's description