Merge branch 'pr/190' into pr/188

This commit is contained in:
Kevin Giszewski
2014-07-31 13:36:59 -04:00
+3 -3
View File
@@ -6,9 +6,9 @@ angular.module('umbraco.resources').factory('archetypePropertyEditorResource', f
$http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetAll"), 'Failed to retrieve datatypes from tree service'
);
},
getDataType: function(guid) {
getDataType: function (guid, contentTypeAlias, propertyTypeAlias, archetypeAlias, nodeId) {
return umbRequestHelper.resourcePromise(
$http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetByGuid?guid=" + guid), 'Failed to retrieve datatype'
$http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetByGuid?guid=" + guid + "&contentTypeAlias=" + contentTypeAlias + "&propertyTypeAlias=" + propertyTypeAlias + "&archetypeAlias=" + archetypeAlias + "&nodeId=" + nodeId), 'Failed to retrieve datatype'
);
},
getPropertyEditorMapping: function(alias) {
@@ -26,4 +26,4 @@ angular.module('umbraco.resources').factory('archetypePropertyEditorResource', f
});
}
}
});
});