From 605b81654aa32229a63289e2f9ba2c6d52c1e0fb Mon Sep 17 00:00:00 2001 From: Jeavon Leopold Date: Thu, 30 Oct 2014 12:25:12 +0000 Subject: [PATCH 1/2] Fix for U4-5719 U7.2 - mediaPickerDialog broken for data type prevalues --- .../src/views/prevalueeditors/mediapicker.controller.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js index 633e9cb9f57d..0feabf5bac13 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js @@ -58,7 +58,11 @@ function mediaPickerController($scope, dialogService, entityResource, $log, icon //load media data var modelIds = $scope.model.value ? $scope.model.value.split(',') : []; - entityResource.getByIds(modelIds, $scope.cfg.entityType).then(function (data) { + var entityType = "Media"; + if (!$scope.cfg === undefined) { + entityType = $scope.cfg.entityType; + } + entityResource.getByIds(modelIds, entityType).then(function (data) { _.each(data, function (item, i) { item.icon = iconHelper.convertFromLegacyIcon(item.icon); $scope.renderModel.push({ name: item.name, id: item.id, icon: item.icon }); From ac7bc09099123a6edf5a699e851d14a8c3655f9c Mon Sep 17 00:00:00 2001 From: Jeavon Leopold Date: Thu, 30 Oct 2014 12:40:13 +0000 Subject: [PATCH 2/2] Fixed to entity type to "Media" --- .../src/views/prevalueeditors/mediapicker.controller.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js index 0feabf5bac13..734c9ff02d04 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js @@ -58,11 +58,7 @@ function mediaPickerController($scope, dialogService, entityResource, $log, icon //load media data var modelIds = $scope.model.value ? $scope.model.value.split(',') : []; - var entityType = "Media"; - if (!$scope.cfg === undefined) { - entityType = $scope.cfg.entityType; - } - entityResource.getByIds(modelIds, entityType).then(function (data) { + entityResource.getByIds(modelIds, "Media").then(function (data) { _.each(data, function (item, i) { item.icon = iconHelper.convertFromLegacyIcon(item.icon); $scope.renderModel.push({ name: item.name, id: item.id, icon: item.icon });