From fcb023061a7be2ce3d954abc1eeed30faf71590e Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 02 九月 2024 15:59:56 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_LibCal_EventEvent/StaticMethod_ValidateInput.qbl | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/_Main/BL/Type_LibCal_EventEvent/StaticMethod_ValidateInput.qbl b/_Main/BL/Type_LibCal_EventEvent/StaticMethod_ValidateInput.qbl
index d06fde8..9d72e56 100644
--- a/_Main/BL/Type_LibCal_EventEvent/StaticMethod_ValidateInput.qbl
+++ b/_Main/BL/Type_LibCal_EventEvent/StaticMethod_ValidateInput.qbl
@@ -3,6 +3,7 @@
StaticMethod ValidateInput (
output String feedback,
LibCal_CalendarRegistry owner,
+ LibCal_EventType eventtype,
String id,
String name
) as Boolean
@@ -12,7 +13,7 @@
// 鐢勫叞楦� May-31-2024 (created)
feedback := '';
- if( exists( owner, EventType, et, et.ID() = id or et.Name() = name ) ){
+ if( exists( owner, EventType, et, ( et.ID() = id or et.Name() = name ) and ( isnull( eventtype ) or eventtype <> et ) ) ){
feedback := Translations::MP_LibCal_EventType_Exist();
}
--
Gitblit v1.9.3