alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Entanglement] Move composition check up

Browse Source 
Move check for composition up higher in the sequence of
if-blocks in the validation step of linking; remove
fallback to [] for undefined composition, which is no
longer necessary as a consequence of this.

nasa/openmctweb#98
This commit is contained in:
Victor Woeltjen
2015-09-22 15:53:27 -07:00
parent 8db334e45b
commit 97892869ae
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/entanglement/src/services/LinkService.js
View File

@@ -45,14 +45,17 @@ define(
if (parentCandidate.getId() === object.getId()) { if (parentCandidate.getId() === object.getId()) {
return false; return false;
} }
if ((parentCandidate.getModel().composition || []).indexOf(object.getId()) !== -1) { if (!parentCandidate.hasCapability('composition')) {
return false;
}
if (parentCandidate.getModel().composition.indexOf(object.getId()) !== -1) {
return false; return false;
} }
return this.policyService.allow( return this.policyService.allow(
"composition", "composition",
parentCandidate.getCapability('type'), parentCandidate.getCapability('type'),
object.getCapability('type') object.getCapability('type')
) && parentCandidate.hasCapability('composition'); );
}; };
LinkService.prototype.perform = function (object, parentObject) { LinkService.prototype.perform = function (object, parentObject) {