From 8801592d280ff58beb5677a86c263f7c05c0b7c0 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期三, 31 七月 2024 17:42:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/BL/Type_LibCal_ExplicitTimeInterval/StaticMethod_Delete.qbl | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/_Main/BL/Type_LibCal_ExplicitTimeInterval/StaticMethod_Delete.qbl b/_Main/BL/Type_LibCal_ExplicitTimeInterval/StaticMethod_Delete.qbl
index b90eafb..a9cb34f 100644
--- a/_Main/BL/Type_LibCal_ExplicitTimeInterval/StaticMethod_Delete.qbl
+++ b/_Main/BL/Type_LibCal_ExplicitTimeInterval/StaticMethod_Delete.qbl
@@ -18,9 +18,13 @@
}
}
if( not isnull( leadingeti ) ){
- eti.Delete();
+ subscription := selectobject( eti, Participation.Event.LeadingParticipation.Subscription, subscription, subscription.Calendar().CalendarID() = eti.Participation().Calendar().CalendarID() );
+ if( subscription.ExplicitTimeInterval( relsize ) = 1 ){
+ subscription.Delete();
+ }else{
+ eti.Delete();
+ }
}
-
}
*]
}
--
Gitblit v1.9.3