From 198edec4f4f9f72bf3ebea1dbdbd4ebfc37ee282 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Mon, 16 Jan 2017 10:09:53 +0100
Subject: [PATCH] add fallback icons

---
 .../contentpicker/contentpicker.controller.js | 21 ++++++++++++++++++-
 .../memberpicker/memberpicker.controller.js   |  3 ++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index ccf9d865bc..e77e743f2b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -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 : "";
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js
index 0d4b2817d0..0029332f64 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js
@@ -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 });
         });
     });