From 61e65f2408f51276fea12b0f1aefaa6a36922432 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期一, 02 九月 2024 12:09:46 +0800
Subject: [PATCH] 事件类型更新校验bug
---
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditEventType/Response_pnlActions_btnOk_OnClick.def | 2 +-
_Main/BL/Type_LibCal_EventEvent/StaticMethod_ValidateInput.qbl | 3 ++-
2 files changed, 3 insertions(+), 2 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();
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditEventType/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditEventType/Response_pnlActions_btnOk_OnClick.def
index dfdc08e..e650a93 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditEventType/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditEventType/Response_pnlActions_btnOk_OnClick.def
@@ -9,7 +9,7 @@
[*
owner := LibCal_GlobalState.dhGlobalCalendarRegistry().Data();
- return LibCal_EventType::ValidateInput( feedback, owner, efID.Text(), efName.Text() );
+ return LibCal_EventType::ValidateInput( feedback, owner, dhDialogData.Data().WrappedInstance(), efID.Text(), efName.Text() );
*]
QuillAction
{
--
Gitblit v1.9.3