ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-15 21:58:13 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Composition] Fix adapter composition policy

Browse Source 
...as this had fallen out-of-date with existing APIs.
Fixes #1257.
This commit is contained in:
Victor Woeltjen
2016-10-17 10:43:12 -07:00
parent 3b06e32b40
commit 0759ba6722
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/adapter/policies/AdapterCompositionPolicy.js
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;