ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-25 07:41:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/open1007' into open-master

Browse Source
This commit is contained in:
bwyu 2015-03-16 10:59:29 -07:00
commit d86e27504f
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/core/bundle.json
View File

@ -130,6 +130,11 @@
"implementation": "capabilities/CompositionCapability.js", "implementation": "capabilities/CompositionCapability.js",
"depends": [ "$injector" ] "depends": [ "$injector" ]
}, },
{
"key": "relationship",
"implementation": "capabilities/RelationshipCapability.js",
"depends": [ "$injector" ]
},
{ {
"key": "type", "key": "type",
"implementation": "types/TypeCapability.js", "implementation": "types/TypeCapability.js",

2
platform/core/src/capabilities/RelationshipCapability.js
View File

@ -66,7 +66,7 @@ define(
.then(packageObject); .then(packageObject);
} }
return lastPromise; return lastPromise[key];
} }
// List types of relationships which this object has // List types of relationships which this object has