From c9bbb158be1d81cc7e9842dfa437c9ca1c617394 Mon Sep 17 00:00:00 2001 From: Benjamin Carleski Date: Tue, 21 Jan 2020 17:50:20 -0800 Subject: [PATCH 1/2] Remove obsolete Stylesheet constant and references --- src/Umbraco.Abstractions/Constants-ObjectTypes.cs | 3 --- src/Umbraco.Abstractions/Models/UmbracoObjectTypes.cs | 8 -------- src/Umbraco.Abstractions/UdiEntityTypeHelper.cs | 4 ---- .../Services/Implement/FileService.cs | 2 -- src/Umbraco.Web/Editors/RelationTypeController.cs | 1 - 5 files changed, 18 deletions(-) diff --git a/src/Umbraco.Abstractions/Constants-ObjectTypes.cs b/src/Umbraco.Abstractions/Constants-ObjectTypes.cs index 51adc69963..dacd7d9fc5 100644 --- a/src/Umbraco.Abstractions/Constants-ObjectTypes.cs +++ b/src/Umbraco.Abstractions/Constants-ObjectTypes.cs @@ -68,9 +68,6 @@ namespace Umbraco.Core public const string IdReservation = "92849B1E-3904-4713-9356-F646F87C25F4"; - [Obsolete("This no longer exists in the database")] - public const string Stylesheet = "9F68DA4F-A3A8-44C2-8226-DCBD125E4840"; - // ReSharper restore MemberHidesStaticFromOuterClass } diff --git a/src/Umbraco.Abstractions/Models/UmbracoObjectTypes.cs b/src/Umbraco.Abstractions/Models/UmbracoObjectTypes.cs index a9bcbc2b65..f403ea6e67 100644 --- a/src/Umbraco.Abstractions/Models/UmbracoObjectTypes.cs +++ b/src/Umbraco.Abstractions/Models/UmbracoObjectTypes.cs @@ -83,14 +83,6 @@ namespace Umbraco.Core.Models [FriendlyName("Recycle Bin")] RecycleBin, - /// - /// Stylesheet - /// - [UmbracoObjectType(Constants.ObjectTypes.Strings.Stylesheet)] - [FriendlyName("Stylesheet")] - [UmbracoUdiType(Constants.UdiEntityType.Stylesheet)] - Stylesheet, - /// /// Member /// diff --git a/src/Umbraco.Abstractions/UdiEntityTypeHelper.cs b/src/Umbraco.Abstractions/UdiEntityTypeHelper.cs index 12e934b9ec..39ee28488f 100644 --- a/src/Umbraco.Abstractions/UdiEntityTypeHelper.cs +++ b/src/Umbraco.Abstractions/UdiEntityTypeHelper.cs @@ -38,8 +38,6 @@ namespace Umbraco.Core return Constants.UdiEntityType.MemberType; case UmbracoObjectTypes.MemberGroup: return Constants.UdiEntityType.MemberGroup; - case UmbracoObjectTypes.Stylesheet: - return Constants.UdiEntityType.Stylesheet; case UmbracoObjectTypes.RelationType: return Constants.UdiEntityType.RelationType; case UmbracoObjectTypes.FormsForm: @@ -86,8 +84,6 @@ namespace Umbraco.Core return UmbracoObjectTypes.MemberType; case Constants.UdiEntityType.MemberGroup: return UmbracoObjectTypes.MemberGroup; - case Constants.UdiEntityType.Stylesheet: - return UmbracoObjectTypes.Stylesheet; case Constants.UdiEntityType.RelationType: return UmbracoObjectTypes.RelationType; case Constants.UdiEntityType.FormsForm: diff --git a/src/Umbraco.Infrastructure/Services/Implement/FileService.cs b/src/Umbraco.Infrastructure/Services/Implement/FileService.cs index 25f2c619d2..2b33b54cc8 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/FileService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/FileService.cs @@ -88,7 +88,6 @@ namespace Umbraco.Core.Services.Implement saveEventArgs.CanCancel = false; scope.Events.Dispatch(SavedStylesheet, this, saveEventArgs); - Audit(AuditType.Save, userId, -1, UmbracoObjectTypes.Stylesheet.GetName()); scope.Complete(); } } @@ -116,7 +115,6 @@ namespace Umbraco.Core.Services.Implement deleteEventArgs.CanCancel = false; scope.Events.Dispatch(DeletedStylesheet, this, deleteEventArgs); - Audit(AuditType.Delete, userId, -1, UmbracoObjectTypes.Stylesheet.GetName()); scope.Complete(); } } diff --git a/src/Umbraco.Web/Editors/RelationTypeController.cs b/src/Umbraco.Web/Editors/RelationTypeController.cs index 73a659bde5..9910bce2d0 100644 --- a/src/Umbraco.Web/Editors/RelationTypeController.cs +++ b/src/Umbraco.Web/Editors/RelationTypeController.cs @@ -96,7 +96,6 @@ namespace Umbraco.Web.Editors new ObjectType{Id = UmbracoObjectTypes.MemberType.GetGuid(), Name = UmbracoObjectTypes.MemberType.GetFriendlyName()}, new ObjectType{Id = UmbracoObjectTypes.DataType.GetGuid(), Name = UmbracoObjectTypes.DataType.GetFriendlyName()}, new ObjectType{Id = UmbracoObjectTypes.MemberGroup.GetGuid(), Name = UmbracoObjectTypes.MemberGroup.GetFriendlyName()}, - new ObjectType{Id = UmbracoObjectTypes.Stylesheet.GetGuid(), Name = UmbracoObjectTypes.Stylesheet.GetFriendlyName()}, new ObjectType{Id = UmbracoObjectTypes.ROOT.GetGuid(), Name = UmbracoObjectTypes.ROOT.GetFriendlyName()}, new ObjectType{Id = UmbracoObjectTypes.RecycleBin.GetGuid(), Name = UmbracoObjectTypes.RecycleBin.GetFriendlyName()}, }; From 0e150161f76447ce3dc29cf86893da60538978f8 Mon Sep 17 00:00:00 2001 From: Benjamin Carleski Date: Wed, 5 Feb 2020 01:52:10 -0800 Subject: [PATCH 2/2] Add audit messages back --- src/Umbraco.Infrastructure/Services/Implement/FileService.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Infrastructure/Services/Implement/FileService.cs b/src/Umbraco.Infrastructure/Services/Implement/FileService.cs index 2b33b54cc8..2a7a743273 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/FileService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/FileService.cs @@ -87,6 +87,7 @@ namespace Umbraco.Core.Services.Implement _stylesheetRepository.Save(stylesheet); saveEventArgs.CanCancel = false; scope.Events.Dispatch(SavedStylesheet, this, saveEventArgs); + Audit(AuditType.Save, userId, -1, "Stylesheet"); scope.Complete(); } @@ -114,6 +115,7 @@ namespace Umbraco.Core.Services.Implement _stylesheetRepository.Delete(stylesheet); deleteEventArgs.CanCancel = false; scope.Events.Dispatch(DeletedStylesheet, this, deleteEventArgs); + Audit(AuditType.Delete, userId, -1, "Stylesheet"); scope.Complete(); }