Merge pull request #1260 from nasa/open1257

[Composition] Fix adapter composition policy
This commit is contained in:
Andrew Henry 2016-10-18 12:04:04 -07:00 committed by GitHub
commit 08ca7659e7

View File

@ -21,8 +21,8 @@
*****************************************************************************/
define([], function () {
function AdapterCompositionPolicy(mct) {
this.mct = mct;
function AdapterCompositionPolicy(openmct) {
this.openmct = openmct;
}
AdapterCompositionPolicy.prototype.allow = function (
@ -32,16 +32,10 @@ define([], function () {
var containerObject = containerType.getInitialModel();
var childObject = childType.getInitialModel();
containerObject.type = containerType.getKey();
childObject.type = childType.getKey();
var composition = this.mct.Composition(containerObject);
if (composition) {
return composition.canContain(childObject);
}
return true;
return this.openmct.composition.checkPolicy(
containerObject,
childObject
);
};
return AdapterCompositionPolicy;