From 6ea7b323636da5ee8452456fbd3af3ec5d1a6da0 Mon Sep 17 00:00:00 2001 From: Robert Foster Date: Sat, 8 Nov 2014 00:57:37 +1100 Subject: [PATCH 1/2] Fixes issue U4-5754 Attempt to set start node on Media Picker sends user to Content section --- .../src/views/prevalueeditors/mediapicker.controller.js | 2 +- 1 file changed, 1 insertion(+), 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 633e9cb9f5..664c246b14 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,7 @@ 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) { + entityResource.getByIds(modelIds, dialogOptions.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 ca951aa56b9f928d1f1c34f178f7f28bc824b4ec Mon Sep 17 00:00:00 2001 From: Robert Foster Date: Sat, 8 Nov 2014 01:13:17 +1100 Subject: [PATCH 2/2] Fix for issue U4-5755 Issue: Multiple mixins with same tab cause content node edit crash --- src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs index 264d90f36d..81817da200 100644 --- a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs @@ -211,7 +211,7 @@ namespace Umbraco.Web.Models.Mapping } //then we'll just use the root group's data to make the composite tab - var rootGroup = propertyGroups.Single(x => x.ParentId == null); + var rootGroup = propertyGroups.First(x => x.ParentId == null); aggregateTabs.Add(new Tab { Id = rootGroup.Id,