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 () { define([], function () {
function AdapterCompositionPolicy(mct) { function AdapterCompositionPolicy(openmct) {
this.mct = mct; this.openmct = openmct;
} }
AdapterCompositionPolicy.prototype.allow = function ( AdapterCompositionPolicy.prototype.allow = function (
@ -32,16 +32,10 @@ define([], function () {
var containerObject = containerType.getInitialModel(); var containerObject = containerType.getInitialModel();
var childObject = childType.getInitialModel(); var childObject = childType.getInitialModel();
containerObject.type = containerType.getKey(); return this.openmct.composition.checkPolicy(
childObject.type = childType.getKey(); containerObject,
childObject
var composition = this.mct.Composition(containerObject); );
if (composition) {
return composition.canContain(childObject);
}
return true;
}; };
return AdapterCompositionPolicy; return AdapterCompositionPolicy;