yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds UDI support for the content picker

Browse Source
This commit is contained in:
Shannon
2017-02-01 13:38:42 +11:00
parent e95cb14d48
commit 83757c60b5
3 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
View File

@@ -17,11 +17,21 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
$scope.$watch(function () {
//return the joined Ids as a string to watch
return _.map($scope.renderModel, function (i) {
return i.id;
if ($scope.model.config.idType === "udi") {
return i.udi;
}
else {
return i.id;
}
}).join();
}, function (newVal) {
var currIds = _.map($scope.renderModel, function (i) {
return i.id;
if ($scope.model.config.idType === "udi") {
return i.udi;
}
else {
return i.id;
}
});
$scope.model.value = trim(currIds.join(), ",");
@@ -200,7 +210,12 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
$scope.add = function (item) {
var currIds = _.map($scope.renderModel, function (i) {
return i.id;
if ($scope.model.config.idType === "udi") {
return i.udi;
}
else {
return i.id;
}
});
if (currIds.indexOf(item.id) < 0) {
@@ -227,7 +242,12 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
var currIds = _.map($scope.renderModel, function (i) {
return i.id;
if ($scope.model.config.idType === "udi") {
return i.udi;
}
else {
return i.id;
}
});
$scope.model.value = trim(currIds.join(), ",");
});
@@ -244,7 +264,12 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
_.each(modelIds, function (id, i) {
var entity = _.find(data, function (d) {
return d.id == id;
if ($scope.model.config.idType === "udi") {
return d.udi == id;
}
else {
return d.id == id;
}
});
if (entity) {
@@ -304,6 +329,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
$scope.renderModel.push({
"name": item.name,
"id": item.id,
"udi": item.udi,
"icon": item.icon,
"path": item.path,
"url": item.url,