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

Converted over SendToPublishEventArgs to new events.

Browse Source
This commit is contained in:
Shannon Deminick
2012-12-21 07:20:39 +05:00
parent d0769cef0f
commit 9f9afe2ee6
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Umbraco.Core/Events/SendToPublishEventArgs.cs
View File

@@ -1,4 +1,21 @@
namespace Umbraco.Core.Events
{
public class SendToPublishEventArgs : System.ComponentModel.CancelEventArgs { }
public class SendToPublishEventArgs<TEntity> : CancellableObjectEventArgs<TEntity>
{
public SendToPublishEventArgs(TEntity eventObject, bool canCancel) : base(eventObject, canCancel)
{
}
public SendToPublishEventArgs(TEntity eventObject) : base(eventObject)
{
}
/// <summary>
/// The entity being sent to publish
/// </summary>
public TEntity Entity
{
get { return EventObject; }
}
}
}

23
src/Umbraco.Core/Services/ContentService.cs
View File

@@ -1066,24 +1066,17 @@ namespace Umbraco.Core.Services
/// <returns>True if sending publication was succesfull otherwise false</returns>
internal bool SendToPublication(IContent content, int userId = -1)
{
//TODO Implement something similar to this
var e = new SendToPublishEventArgs();
if (SendingToPublish != null)
SendingToPublish(content, e);
if (SendingToPublish.IsRaisedEventCancelled(new SendToPublishEventArgs<IContent>(content), this))
return false;
if (!e.Cancel)
{
// Do some stuff here.. RunActionHandlers
//TODO: Do some stuff here.. RunActionHandlers
if (SentToPublish != null)
SentToPublish(content, e);
SentToPublish.RaiseEvent(new SendToPublishEventArgs<IContent>(content, false), this);
Audit.Add(AuditTypes.SendToPublish, "Send to Publish performed by user", content.WriterId, content.Id);
Audit.Add(AuditTypes.SendToPublish, "Send to Publish performed by user", content.WriterId, content.Id);
return true;
}
return false;
return true;
}
/// <summary>
@@ -1309,12 +1302,12 @@ namespace Umbraco.Core.Services
/// <summary>
/// Occurs before Send to Publish
/// </summary>
public static event EventHandler<SendToPublishEventArgs> SendingToPublish;
public static event TypedEventHandler<IContentService, SendToPublishEventArgs<IContent>> SendingToPublish;
/// <summary>
/// Occurs after Send to Publish
/// </summary>
public static event EventHandler<SendToPublishEventArgs> SentToPublish;
public static event TypedEventHandler<IContentService, SendToPublishEventArgs<IContent>> SentToPublish;
#endregion
}
}