respect default_duration_setting (#1115)

docker duration setting fix
bmlt-enabled · Nov 5, 2024 · a458a29 · a458a29
1 parent 0056a71
commit a458a29
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/docker/write-config.sh b/docker/write-config.sh
@@ -5,6 +5,7 @@ sed -i '/dbPassword/d' /var/www/html/auto-config.inc.php
 sed -i '/dbServer/d' /var/www/html/auto-config.inc.php
 sed -i '/dbPrefix/d' /var/www/html/auto-config.inc.php
 sed -i '/do_not_force_port/d' /var/www/html/auto-config.inc.php
+sed -i '/default_duration_time/d' /var/www/html/auto-config.inc.php
 
 if [ ! -z $GKEY ]
 then
@@ -65,3 +66,8 @@ if [ ! -z "$MEETING_COUNTIES_AND_SUB_PROVINCES" ]
 then
     echo "\$meeting_counties_and_sub_provinces = \"${MEETING_COUNTIES_AND_SUB_PROVINCES}\";" >> /var/www/html/auto-config.inc.php
 fi
+
+if [ ! -z "$DEFAULT_DURATION_TIME" -a "$DEFAULT_DURATION_TIME" == "1:00:00" ]
+then
+    echo "\$default_duration_time = \"$DEFAULT_DURATION_TIME\";" >> /var/www/html/auto-config.inc.php
+fi
diff --git a/src/resources/js/components/MeetingEditForm.svelte b/src/resources/js/components/MeetingEditForm.svelte
@@ -111,14 +111,15 @@
   }>();
 
   const defaultLatLng = { lat: Number(globalSettings.centerLatitude ?? -79.793701171875), lng: Number(globalSettings.centerLongitude ?? 36.065752051707) };
+  const defaultDuration = globalSettings.defaultDuration ?? '01:00';
   const initialValues = {
     serviceBodyId: selectedMeeting?.serviceBodyId ?? -1,
     formatIds: selectedMeeting?.formatIds ?? [],
     venueType: selectedMeeting?.venueType ?? VENUE_TYPE_IN_PERSON,
     temporarilyVirtual: selectedMeeting?.temporarilyVirtual ?? false,
     day: selectedMeeting?.day ?? 0,
     startTime: selectedMeeting?.startTime ?? '12:00',
-    duration: selectedMeeting?.duration ?? '01:00',
+    duration: selectedMeeting?.duration ?? defaultDuration,
     timeZone: selectedMeeting?.timeZone ?? '',
     latitude: selectedMeeting?.latitude ?? defaultLatLng.lat,
     longitude: selectedMeeting?.longitude ?? defaultLatLng.lng,