Merge pull request #10496 from umbraco/v8/fix/10483

Fixes clashing aliases when new mediatypes had been installed

Author: Warren Buckley

src/Umbraco.Core/Constants-Conventions.cs

@@ -119,25 +119,45 @@ public static class MediaTypes
                 public const string Image = "Image";
 
                 /// <summary>
-                /// MediaType alias for a video.
+                /// MediaType name for a video.
                 /// </summary>
                 public const string Video = "Video";
 
                 /// <summary>
-                /// MediaType alias for an audio.
+                /// MediaType name for an audio.
                 /// </summary>
                 public const string Audio = "Audio";
 
                 /// <summary>
-                /// MediaType alias for an article.
+                /// MediaType name for an article.
                 /// </summary>
                 public const string Article = "Article";
 
                 /// <summary>
-                /// MediaType alias for vector graphics.
+                /// MediaType name for vector graphics.
                 /// </summary>
                 public const string VectorGraphics = "VectorGraphics";
 
+                /// <summary>
+                /// MediaType alias for a video.
+                /// </summary>
+                public const string VideoAlias = "umbracoMediaVideo";
+
+                /// <summary>
+                /// MediaType alias for an audio.
+                /// </summary>
+                public const string AudioAlias = "umbracoMediaAudio";
+
+                /// <summary>
+                /// MediaType alias for an article.
+                /// </summary>
+                public const string ArticleAlias = "umbracoMediaArticle";
+
+                /// <summary>
+                /// MediaType alias for vector graphics.
+                /// </summary>
+                public const string VectorGraphicsAlias = "umbracoMediaVectorGraphics";
+
                 /// <summary>
                 /// MediaType alias indicating allowing auto-selection.
                 /// </summary>

src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs

@@ -174,10 +174,10 @@ private void CreateContentTypeData()
             _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 532, NodeId = 1031, Alias = Constants.Conventions.MediaTypes.Folder, Icon = Constants.Icons.MediaFolder, Thumbnail = Constants.Icons.MediaFolder, IsContainer = false, AllowAtRoot = true, Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 533, NodeId = 1032, Alias = Constants.Conventions.MediaTypes.Image, Icon = Constants.Icons.MediaImage, Thumbnail = Constants.Icons.MediaImage, AllowAtRoot = true, Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 534, NodeId = 1033, Alias = Constants.Conventions.MediaTypes.File, Icon = Constants.Icons.MediaFile, Thumbnail = Constants.Icons.MediaFile, AllowAtRoot = true, Variations = (byte) ContentVariation.Nothing });
-            _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 540, NodeId = 1034, Alias = Constants.Conventions.MediaTypes.Video, Icon = Constants.Icons.MediaVideo, Thumbnail = Constants.Icons.MediaVideo, AllowAtRoot = true, Variations = (byte) ContentVariation.Nothing });
-            _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 541, NodeId = 1035, Alias = Constants.Conventions.MediaTypes.Audio, Icon = Constants.Icons.MediaAudio, Thumbnail = Constants.Icons.MediaAudio, AllowAtRoot = true, Variations = (byte) ContentVariation.Nothing });
-            _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 542, NodeId = 1036, Alias = Constants.Conventions.MediaTypes.Article, Icon = Constants.Icons.MediaArticle, Thumbnail = Constants.Icons.MediaArticle, AllowAtRoot = true, Variations = (byte) ContentVariation.Nothing });
-            _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 543, NodeId = 1037, Alias = Constants.Conventions.MediaTypes.VectorGraphics, Icon = Constants.Icons.MediaVectorGraphics, Thumbnail = Constants.Icons.MediaVectorGraphics, AllowAtRoot = true, Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 540, NodeId = 1034, Alias = Constants.Conventions.MediaTypes.VideoAlias, Icon = Constants.Icons.MediaVideo, Thumbnail = Constants.Icons.MediaVideo, AllowAtRoot = true, Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 541, NodeId = 1035, Alias = Constants.Conventions.MediaTypes.AudioAlias, Icon = Constants.Icons.MediaAudio, Thumbnail = Constants.Icons.MediaAudio, AllowAtRoot = true, Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 542, NodeId = 1036, Alias = Constants.Conventions.MediaTypes.ArticleAlias, Icon = Constants.Icons.MediaArticle, Thumbnail = Constants.Icons.MediaArticle, AllowAtRoot = true, Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 543, NodeId = 1037, Alias = Constants.Conventions.MediaTypes.VectorGraphicsAlias, Icon = Constants.Icons.MediaVectorGraphics, Thumbnail = Constants.Icons.MediaVectorGraphics, AllowAtRoot = true, Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.ContentType, "pk", false, new ContentTypeDto { PrimaryKey = 531, NodeId = 1044, Alias = Constants.Conventions.MemberTypes.DefaultAlias, Icon = Constants.Icons.Member, Thumbnail = Constants.Icons.Member, Variations = (byte) ContentVariation.Nothing });
         }
 

src/Umbraco.Tests/Services/MediaServiceTests.cs

@@ -165,7 +165,7 @@ public void Cannot_Save_Media_With_Empty_Name()
             var mediaService = ServiceContext.MediaService;
             var mediaType = MockedContentTypes.CreateNewMediaType();
             ServiceContext.MediaTypeService.Save(mediaType);
-            var media = mediaService.CreateMedia(string.Empty, -1, "video");
+            var media = mediaService.CreateMedia(string.Empty, -1, Constants.Conventions.MediaTypes.VideoAlias);
 
             // Act & Assert
             Assert.Throws<ArgumentException>(() => mediaService.Save(media));
@@ -177,7 +177,7 @@ public void Ensure_Content_Xml_Created()
             var mediaService = ServiceContext.MediaService;
             var mediaType = MockedContentTypes.CreateNewMediaType();
             ServiceContext.MediaTypeService.Save(mediaType);
-            var media = mediaService.CreateMedia("Test", -1, "video");
+            var media = mediaService.CreateMedia("Test", -1, Constants.Conventions.MediaTypes.VideoAlias);
 
             mediaService.Save(media);