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

Merge pull request #7491 from benjaminc/netcore/feature/7368-CleanupObsoletes

Browse Source 
Remove obsolete Stylesheet constant and references
This commit is contained in:
Bjarke Berg
2020-02-05 11:36:08 +01:00
committed by GitHub
parent 0c619b184e 0e150161f7
commit 4e3980dd71
5 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Abstractions/Constants-ObjectTypes.cs
View File

@@ -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
}

8
src/Umbraco.Abstractions/Models/UmbracoObjectTypes.cs
View File

@@ -83,14 +83,6 @@ namespace Umbraco.Core.Models
[FriendlyName("Recycle Bin")]
RecycleBin,
/// <summary>
/// Stylesheet
/// </summary>
[UmbracoObjectType(Constants.ObjectTypes.Strings.Stylesheet)]
[FriendlyName("Stylesheet")]
[UmbracoUdiType(Constants.UdiEntityType.Stylesheet)]
Stylesheet,
/// <summary>
/// Member
/// </summary>

4
src/Umbraco.Abstractions/UdiEntityTypeHelper.cs
View File

@@ -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:

4
src/Umbraco.Infrastructure/Services/Implement/FileService.cs
View File

@@ -87,8 +87,8 @@ namespace Umbraco.Core.Services.Implement
_stylesheetRepository.Save(stylesheet);
saveEventArgs.CanCancel = false;
scope.Events.Dispatch(SavedStylesheet, this, saveEventArgs);
Audit(AuditType.Save, userId, -1, "Stylesheet");
Audit(AuditType.Save, userId, -1, UmbracoObjectTypes.Stylesheet.GetName());
scope.Complete();
}
}
@@ -115,8 +115,8 @@ namespace Umbraco.Core.Services.Implement
_stylesheetRepository.Delete(stylesheet);
deleteEventArgs.CanCancel = false;
scope.Events.Dispatch(DeletedStylesheet, this, deleteEventArgs);
Audit(AuditType.Delete, userId, -1, "Stylesheet");
Audit(AuditType.Delete, userId, -1, UmbracoObjectTypes.Stylesheet.GetName());
scope.Complete();
}
}

1
src/Umbraco.Web/Editors/RelationTypeController.cs
View File

@@ -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()},
};