alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected merge issues from Master

Browse Source
This commit is contained in:
Henry
2015-12-08 14:07:32 -08:00
parent 18607e9404
commit 4fbf547bfc
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/commonUI/browse/bundle.json
View File

@@ -157,7 +157,7 @@
"type": "provider", "type": "provider",
"implementation": "creation/CreateActionProvider.js", "implementation": "creation/CreateActionProvider.js",
"depends": ["$q", "typeService", "depends": ["$q", "typeService",
"navigationService"] "navigationService", "policyService"]
}, },
{ {
"key": "CreationService", "key": "CreationService",

3
platform/commonUI/browse/src/creation/CreateActionProvider.js
View File

@@ -46,10 +46,11 @@ define(
* introduced in this bundle), responsible for handling actual * introduced in this bundle), responsible for handling actual
* object creation. * object creation.
*/ */
function CreateActionProvider($q, typeService, navigationService) { function CreateActionProvider($q, typeService, navigationService, policyService) {
this.typeService = typeService; this.typeService = typeService;
this.navigationService = navigationService; this.navigationService = navigationService;
this.$q = $q; this.$q = $q;
this.policyService = policyService;
} }
CreateActionProvider.prototype.getActions = function (actionContext) { CreateActionProvider.prototype.getActions = function (actionContext) {