Status |
#($Select(tEvent.Status:"OK",1:$system.Status.GetErrorText(tEvent.Status)))# |
diff --git a/PivotSubscriptions/UI/SubscriptionManager.cls b/PivotSubscriptions/UI/SubscriptionManager.cls
index a365e5d..4ab6402 100644
--- a/PivotSubscriptions/UI/SubscriptionManager.cls
+++ b/PivotSubscriptions/UI/SubscriptionManager.cls
@@ -133,7 +133,7 @@ Method Delete(pId As %Integer) As %String [ ZenMethod ]
Set tMsg="Subscription Deleted."
Set tSubscription=##class(PivotSubscriptions.Subscription).%OpenId(pId)
- Set tSC=##class(PivotSubscriptions.EventLog).CreateEvent("delete",pId,$username,tSubscription.Pivot,tSubscription.DayOfWeek,tSubscription.Hour,tSubscription.Minute,tSubscription.Format,tSubscription.Emails,tSubscription.Name,.tEvent)
+ Set tSC=##class(PivotSubscriptions.EventLog).CreateEvent("delete",pId,$username,tSubscription.Pivot,tSubscription.DayOfWeek,tSubscription.Hour,tSubscription.Minute,tSubscription.Format,tSubscription.Emails,tSubscription.Name,tSubscription.RunOnce,.tEvent)
If $$$ISERR(tSC) Quit tSC
@@ -153,7 +153,7 @@ Method SendNow(pId, pPivot, pEmail As %String) As %String [ ZenMethod ]
If pId'=0 {
Set tSubscription=##class(PivotSubscriptions.Subscription).%OpenId(pId)
- Set tSC=##class(PivotSubscriptions.Task).SendSubscription(pId,pPivot,pEmail,tSubscription.Format,tSubscription.DayOfWeek,tSubscription.Hour,tSubscription.Minute,tSubscription.Name)
+ Set tSC=##class(PivotSubscriptions.Task).SendSubscription(pId,1,pPivot,pEmail,tSubscription.Format,tSubscription.DayOfWeek,tSubscription.Hour,tSubscription.Minute,tSubscription.Name)
If $$$ISERR(tSC) {
Set tMsg=$System.Status.GetErrorText(tSC)
diff --git a/PivotSubscriptions/Utils.cls b/PivotSubscriptions/Utils.cls
index 98569a5..cf5b43c 100644
--- a/PivotSubscriptions/Utils.cls
+++ b/PivotSubscriptions/Utils.cls
@@ -3,7 +3,7 @@ Class PivotSubscriptions.Utils
ClassMethod GetVersion() As %String
{
- Quit "v1.4.1"
+ Quit "v1.5.0"
}
/// Utility method for saving and updating global variables
@@ -184,7 +184,7 @@ ClassMethod WriteEmail(pSubscription As PivotSubscriptions.Subscription, pMsg As
ClassMethod TableErrorMessage(pSubscription As PivotSubscriptions.Subscription, pEmail As %String, pName As %String, pReason As %String, pMDX As %String) As %Status
{
Set tAdminEmail=##class(PivotSubscriptions.Utils).GetSettings("AdminEmail")
- Set tLog=##class(PivotSubscriptions.EventLog).CreateEvent("tableError",pSubscription.%Id(),$username,pSubscription.Pivot,pSubscription.DayOfWeek,pSubscription.Hour,pSubscription.Minute,pSubscription.Format,tAdminEmail,pName,.pEvent)
+ Set tLog=##class(PivotSubscriptions.EventLog).CreateEvent("tableError",pSubscription.%Id(),$username,pSubscription.Pivot,pSubscription.DayOfWeek,pSubscription.Hour,pSubscription.Minute,pSubscription.Format,tAdminEmail,pName,pSubscription.RunOnce,.pEvent)
If $$$ISERR(tLog) Quit tLog