Corrected merge issues from Master

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

View File

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

View File

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