diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js index 063a726f44..734b06536d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js @@ -64,8 +64,7 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en var target = link ? { name: link.name, anchor: link.queryString, - // the linkPicker breaks if it get an udi for media - udi: link.isMedia ? null : link.udi, + udi: link.udi, url: link.url, target: link.target } : null; @@ -79,21 +78,13 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en model.target.anchor = (model.target.anchor.indexOf('=') === -1 ? '#' : '?') + model.target.anchor; } if (link) { - if (link.isMedia && link.url === model.target.url) { - // we can assume the existing media item is changed and no new file has been selected - // so we don't need to update the udi and isMedia fields - } else { - link.udi = model.target.udi; - link.isMedia = model.target.isMedia; - } - + link.udi = model.target.udi; link.name = model.target.name || model.target.url || model.target.anchor; link.queryString = model.target.anchor; link.target = model.target.target; link.url = model.target.url; } else { link = { - isMedia: model.target.isMedia, name: model.target.name || model.target.url || model.target.anchor, queryString: model.target.anchor, target: model.target.target, @@ -104,7 +95,7 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en } if (link.udi) { - var entityType = link.isMedia ? "media" : "document"; + var entityType = model.target.isMedia ? "Media" : "Document"; entityResource.getById(link.udi, entityType).then(function (data) { link.icon = iconHelper.convertFromLegacyIcon(data.icon); diff --git a/src/Umbraco.Web/Models/ContentEditing/LinkDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/LinkDisplay.cs index 857ae2c318..650b7b8db5 100644 --- a/src/Umbraco.Web/Models/ContentEditing/LinkDisplay.cs +++ b/src/Umbraco.Web/Models/ContentEditing/LinkDisplay.cs @@ -9,9 +9,6 @@ namespace Umbraco.Web.Models.ContentEditing [DataMember(Name = "icon")] public string Icon { get; set; } - [DataMember(Name = "isMedia")] - public bool IsMedia { get; set; } - [DataMember(Name = "name")] public string Name { get; set; } diff --git a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs index 1cb590d43c..129df2bacf 100644 --- a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs @@ -64,7 +64,6 @@ namespace Umbraco.Web.PropertyEditors { GuidUdi udi = null; var icon = "icon-link"; - var isMedia = false; var published = true; var trashed = false; var url = dto.Url; @@ -88,7 +87,6 @@ namespace Umbraco.Web.PropertyEditors else if(entity is IContentEntitySlim contentEntity) { icon = contentEntity.ContentTypeIcon; - isMedia = true; published = !contentEntity.Trashed; udi = new GuidUdi(Constants.UdiEntityType.Media, contentEntity.Key); url = _publishedSnapshotAccessor.PublishedSnapshot.Media.GetById(entity.Key)?.Url ?? "#"; @@ -104,7 +102,6 @@ namespace Umbraco.Web.PropertyEditors result.Add(new LinkDisplay { Icon = icon, - IsMedia = isMedia, Name = dto.Name, Target = dto.Target, Trashed = trashed,