Skip to content

Commit 08ca765

Browse files
authored
Merge pull request #1260 from nasa/open1257
[Composition] Fix adapter composition policy
2 parents d7edfb4 + 0759ba6 commit 08ca765

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

src/adapter/policies/AdapterCompositionPolicy.js

+6-12
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
*****************************************************************************/
2222

2323
define([], function () {
24-
function AdapterCompositionPolicy(mct) {
25-
this.mct = mct;
24+
function AdapterCompositionPolicy(openmct) {
25+
this.openmct = openmct;
2626
}
2727

2828
AdapterCompositionPolicy.prototype.allow = function (
@@ -32,16 +32,10 @@ define([], function () {
3232
var containerObject = containerType.getInitialModel();
3333
var childObject = childType.getInitialModel();
3434

35-
containerObject.type = containerType.getKey();
36-
childObject.type = childType.getKey();
37-
38-
var composition = this.mct.Composition(containerObject);
39-
40-
if (composition) {
41-
return composition.canContain(childObject);
42-
}
43-
44-
return true;
35+
return this.openmct.composition.checkPolicy(
36+
containerObject,
37+
childObject
38+
);
4539
};
4640

4741
return AdapterCompositionPolicy;

0 commit comments

Comments
 (0)