From acf70acb5438a3358d07978afdc0eb28950f40d5 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期一, 12 八月 2024 16:28:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateEvent#778.def | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateEvent\043778.def" "b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateEvent\043778.def"
index ac27f5c..ddcfc95 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateEvent\043778.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateEvent\043778.def"
@@ -48,7 +48,7 @@
// Set the Participation and the related controls
// (only the DataHolders, the Date-controls are set later on, after the recurrence has been initialized)
dhStartDate.Data( sLeadPart.StartDate() );
- //dhEndDate.Data( sLeadPart.EndDate() );
+ dhEndDate.Data( sLeadPart.EndDate() );
dhLeadingParticipation.Data( &sLeadPart );
dhCategory.Data(category_i);
//info( '-----------------------', isnull( dhLeadingParticipation.Data() ) );
@@ -56,6 +56,10 @@
// Initialize the capacity here, when done in the OnCreate() edtCapacity is not disabled correctly.
this.InitializeCapacity();
+ this.InitializeEventTypes();
+
+ ddlEventType.Data( owner_i.CalendarRegistry().GetDefaultEventType() );
+
// Initialize the category here, when done in the OnCreate() there is no selection in the DropDownList.
// Select the general category for new events.
//this.InitializeCategories();
--
Gitblit v1.9.3