From 5a386daa9d62c88a0c6bb669d0f5beba560d77a9 Mon Sep 17 00:00:00 2001 From: jude Date: Thu, 10 Aug 2023 18:25:41 +0100 Subject: [PATCH] Fix expirations --- web/static/js/main.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/web/static/js/main.js b/web/static/js/main.js index 720eb89..b920860 100644 --- a/web/static/js/main.js +++ b/web/static/js/main.js @@ -238,13 +238,17 @@ async function serialize_reminder(node, mode) { utc_time = utc_time.toFormat("yyyy-LL-dd'T'HH:mm:ss"); } - expiration_time = luxon.DateTime.fromISO( - node.querySelector('input[name="time"]').value - ).setZone("UTC"); - if (expiration_time.invalid) { - return { error: "Expiration provided invalid." }; - } else { - expiration_time = expiration_time.toFormat("yyyy-LL-dd'T'HH:mm:ss"); + let expiration = node.querySelector('input[name="expiration"]').value; + + if (expiration) { + expiration_time = luxon.DateTime.fromISO( + node.querySelector('input[name="expiration"]').value + ).setZone("UTC"); + if (expiration_time.invalid) { + return { error: "Expiration provided invalid." }; + } else { + expiration_time = expiration_time.toFormat("yyyy-LL-dd'T'HH:mm:ss"); + } } } @@ -429,7 +433,7 @@ function deserialize_reminder(reminder, frame, mode) { timeInput.value = localTime.toFormat("yyyy-LL-dd'T'HH:mm:ss"); if (reminder["expires"]) { - let expiresInput = frame.querySelector('input[name="time"]'); + let expiresInput = frame.querySelector('input[name="expiration"]'); let expiresTime = luxon.DateTime.fromISO(reminder["expires"], { zone: "UTC", }).setZone(timezone);