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

Merge branch 'temp8' into temp8-fixes-rendering-content-without-template

Browse Source
This commit is contained in:
Stephan
2019-02-18 09:47:45 +01:00
parent 8ea6e2b855 ed6167fb0a
commit c2bf3d0d53
6 changed files with 7 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Core/Services/Implement/ContentService.cs
View File

@@ -320,8 +320,6 @@ namespace Umbraco.Core.Services.Implement
scope.Events.Dispatch(TreeChanged, this, new TreeChange<IContent>(content, TreeChangeTypes.RefreshNode).ToEventArgs());
}
scope.Events.Dispatch(Created, this, new NewEventArgs<IContent>(content, false, content.ContentType.Alias, parent));
if (withIdentity == false)
return;
@@ -2281,15 +2279,6 @@ namespace Umbraco.Core.Services.Implement
/// </summary>
public static event TypedEventHandler<IContentService, ContentSavedEventArgs> Saved;
/// <summary>
/// Occurs after Create
/// </summary>
/// <remarks>
/// Please note that the Content object has been created, but might not have been saved
/// so it does not have an identity yet (meaning no Id has been set).
/// </remarks>
public static event TypedEventHandler<IContentService, NewEventArgs<IContent>> Created;
/// <summary>
/// Occurs before Copy
/// </summary>

13
src/Umbraco.Core/Services/Implement/MediaService.cs
View File

@@ -289,9 +289,7 @@ namespace Umbraco.Core.Services.Implement
scope.Events.Dispatch(Saved, this, saveEventArgs);
scope.Events.Dispatch(TreeChanged, this, new TreeChange<IMedia>(media, TreeChangeTypes.RefreshNode).ToEventArgs());
}
scope.Events.Dispatch(Created, this, new NewEventArgs<IMedia>(media, false, media.ContentType.Alias, parent));
if (withIdentity == false)
return;
@@ -1215,15 +1213,6 @@ namespace Umbraco.Core.Services.Implement
/// </summary>
public static event TypedEventHandler<IMediaService, SaveEventArgs<IMedia>> Saved;
/// <summary>
/// Occurs after Create
/// </summary>
/// <remarks>
/// Please note that the Media object has been created, but might not have been saved
/// so it does not have an identity yet (meaning no Id has been set).
/// </remarks>
public static event TypedEventHandler<IMediaService, NewEventArgs<IMedia>> Created;
/// <summary>
/// Occurs before Media is moved to Recycle Bin
/// </summary>

13
src/Umbraco.Core/Services/Implement/MemberService.cs
View File

@@ -331,9 +331,7 @@ namespace Umbraco.Core.Services.Implement
saveEventArgs.CanCancel = false;
scope.Events.Dispatch(Saved, this, saveEventArgs);
}
scope.Events.Dispatch(Created, this, new NewEventArgs<IMember>(member, false, member.ContentType.Alias, -1));
if (withIdentity == false)
return;
@@ -1110,15 +1108,6 @@ namespace Umbraco.Core.Services.Implement
/// </summary>
public static event TypedEventHandler<IMemberService, SaveEventArgs<IMember>> Saving;
/// <summary>
/// Occurs after Create
/// </summary>
/// <remarks>
/// Please note that the Member object has been created, but might not have been saved
/// so it does not have an identity yet (meaning no Id has been set).
/// </remarks>
public static event TypedEventHandler<IMemberService, NewEventArgs<IMember>> Created;
/// <summary>
/// Occurs after Save
/// </summary>

16
src/Umbraco.Tests/Services/MemberServiceTests.cs
View File

@@ -521,22 +521,6 @@ namespace Umbraco.Tests.Services
Assert.AreEqual("Test Real Name", member.Name);
}
[Test]
public void Get_Member_Name_In_Created_Event()
{
IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
ServiceContext.MemberTypeService.Save(memberType);
TypedEventHandler<IMemberService, NewEventArgs<IMember>> callback = (sender, args) =>
{
Assert.AreEqual("Test Real Name", args.Entity.Name);
};
MemberService.Created += callback;
var member = ServiceContext.MemberService.CreateMember("testUsername", "test@test.com", "Test Real Name", memberType);
MemberService.Created -= callback;
}
[Test]
public void Get_By_Username()
{

5
src/Umbraco.Web.UI/config/serilog.Release.config
View File

@@ -8,6 +8,11 @@
<!-- VALID Values: Verbose, Debug, Information, Warning, Error, Fatal -->
<add key="serilog:minimum-level" value="Information" />
<!-- NOTE: This is how sources can have a different level -->
<!--
<add key="serilog:minimum-level:override:Umbraco.Core.Composing.TypeLoader" value="Warning" />
-->
<!-- NOTE: Only one logger below can be enabled, you cannot log JSON & TXT files at the same time -->
<!-- Default JSON log file -->

2
src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs
View File

@@ -32,7 +32,6 @@ namespace Umbraco.Web.PropertyEditors
private static void Initialize(FileUploadPropertyEditor fileUpload)
{
MediaService.Saving += fileUpload.MediaServiceSaving;
MediaService.Created += fileUpload.MediaServiceCreated;
ContentService.Copied += fileUpload.ContentServiceCopied;
MediaService.Deleted += (sender, args)
@@ -46,7 +45,6 @@ namespace Umbraco.Web.PropertyEditors
private static void Initialize(ImageCropperPropertyEditor imageCropper)
{
MediaService.Saving += imageCropper.MediaServiceSaving;
MediaService.Created += imageCropper.MediaServiceCreated;
ContentService.Copied += imageCropper.ContentServiceCopied;
MediaService.Deleted += (sender, args)