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

Merge pull request #6943 from kjac/v8/fix/protect-system-media-types

Browse Source 
V8: Protect "system media types" from alias changes and deletion
This commit is contained in:
Poornima Nayar
2020-01-09 14:18:10 +00:00
committed by GitHub
parent 418aa89872 546a948d0b
commit 1cd30aae99
6 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Core/Models/MediaTypeExtensions.cs Normal file
View File

@@ -0,0 +1,10 @@
namespace Umbraco.Core.Models
{
internal static class MediaTypeExtensions
{
internal static bool IsSystemMediaType(this IMediaType mediaType) =>
mediaType.Alias == Constants.Conventions.MediaTypes.File
|| mediaType.Alias == Constants.Conventions.MediaTypes.Folder
|| mediaType.Alias == Constants.Conventions.MediaTypes.Image;
}
}

1
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -277,6 +277,7 @@
<Compile Include="Models\Entities\MediaEntitySlim.cs" />
<Compile Include="Models\PagedResult.cs" />
<Compile Include="Models\Entities\MemberEntitySlim.cs" />
<Compile Include="Models\MediaTypeExtensions.cs" />
<Compile Include="Models\PublishedContent\ILivePublishedModelFactory.cs" />
<Compile Include="Models\PublishedContent\IPublishedContentType.cs" />
<Compile Include="Models\PublishedContent\IPublishedPropertyType.cs" />

1
src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
View File

@@ -9,6 +9,7 @@
<umb-editor-header
name="vm.contentType.name"
alias="vm.contentType.alias"
alias-locked="vm.contentType.isSystemMediaType"
key="vm.contentType.key"
description="vm.contentType.description"
navigation="vm.page.navigation"

3
src/Umbraco.Web/Models/ContentEditing/MediaTypeDisplay.cs
View File

@@ -5,6 +5,7 @@ namespace Umbraco.Web.Models.ContentEditing
[DataContract(Name = "contentType", Namespace = "")]
public class MediaTypeDisplay : ContentTypeCompositionDisplay<PropertyTypeDisplay>
{
[DataMember(Name = "isSystemMediaType")]
public bool IsSystemMediaType { get; set; }
}
}

1
src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
View File

@@ -145,6 +145,7 @@ namespace Umbraco.Web.Models.Mapping
//default listview
target.ListViewEditorName = Constants.Conventions.DataTypes.ListViewPrefix + "Media";
target.IsSystemMediaType = source.IsSystemMediaType();
if (string.IsNullOrEmpty(source.Name)) return;

5
src/Umbraco.Web/Trees/MediaTypeTreeController.cs
View File

@@ -120,7 +120,10 @@ namespace Umbraco.Web.Trees
}
menu.Items.Add<ActionCopy>(Services.TextService, opensDialog: true);
menu.Items.Add<ActionDelete>(Services.TextService, opensDialog: true);
if(ct.IsSystemMediaType() == false)
{
menu.Items.Add<ActionDelete>(Services.TextService, opensDialog: true);
}
menu.Items.Add(new RefreshNode(Services.TextService, true));
}