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

add fallback icons

Browse Source
This commit is contained in:
Mads Rasmussen
2017-01-16 10:09:53 +01:00
parent 361f5093c7
commit 198edec4f4
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -231,7 +231,26 @@ function contentPickerController($scope, dialogService, entityResource, contentR
});
if (entity) {
entity.icon = iconHelper.convertFromLegacyIcon(entity.icon);
// set icon
if(entity.icon) {
entity.icon = iconHelper.convertFromLegacyIcon(entity.icon);
}
// set default icon
if (!entity.icon) {
switch (entityType) {
case "Document":
entity.icon = "icon-document";
break;
case "Media":
entity.icon = "icon-picture";
break;
case "Member":
entity.icon = "icon-user";
break;
}
}
var url = (entity.urls && entity.urls.length > 0) ? entity.urls[0] : "";
var path = ($scope.model.config.showPathOnHover) ? entity.path : "";

3
src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js
View File

@@ -97,7 +97,8 @@ function memberPickerController($scope, dialogService, entityResource, $log, ico
var modelIds = $scope.model.value ? $scope.model.value.split(',') : [];
entityResource.getByIds(modelIds, "Member").then(function (data) {
_.each(data, function (item, i) {
item.icon = iconHelper.convertFromLegacyIcon(item.icon);
// set default icon if it's missing
item.icon = (item.icon) ? iconHelper.convertFromLegacyIcon(item.icon) : "icon-user";
$scope.renderModel.push({ name: item.name, id: item.id, icon: item.icon });
});
});