Fixes #7007 -- Properly align publish date/time to station timezone.
This commit is contained in:
parent
f7ebe1cd79
commit
b4e2854fc5
|
@ -42,6 +42,7 @@ import {useTranslate} from "~/vendor/gettext";
|
||||||
import ModalForm from "~/components/Common/ModalForm.vue";
|
import ModalForm from "~/components/Common/ModalForm.vue";
|
||||||
import {useLuxon} from "~/vendor/luxon";
|
import {useLuxon} from "~/vendor/luxon";
|
||||||
import Tabs from "~/components/Common/Tabs.vue";
|
import Tabs from "~/components/Common/Tabs.vue";
|
||||||
|
import {useAzuraCastStation} from "~/vendor/azuracast.ts";
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
...baseEditModalProps,
|
...baseEditModalProps,
|
||||||
|
@ -74,6 +75,7 @@ const {record, reset} = useResettableRef({
|
||||||
});
|
});
|
||||||
|
|
||||||
const {DateTime} = useLuxon();
|
const {DateTime} = useLuxon();
|
||||||
|
const {timezone} = useAzuraCastStation();
|
||||||
|
|
||||||
const {
|
const {
|
||||||
loading,
|
loading,
|
||||||
|
@ -105,7 +107,7 @@ const {
|
||||||
let publishTime = '';
|
let publishTime = '';
|
||||||
|
|
||||||
if (data.publish_at !== null) {
|
if (data.publish_at !== null) {
|
||||||
const publishDateTime = DateTime.fromSeconds(data.publish_at);
|
const publishDateTime = DateTime.fromSeconds(data.publish_at, {zone: timezone});
|
||||||
publishDate = publishDateTime.toISODate();
|
publishDate = publishDateTime.toISODate();
|
||||||
publishTime = publishDateTime.toISOTime({
|
publishTime = publishDateTime.toISOTime({
|
||||||
suppressMilliseconds: true,
|
suppressMilliseconds: true,
|
||||||
|
@ -125,7 +127,7 @@ const {
|
||||||
|
|
||||||
if (modifiedForm.publish_date.length > 0 && modifiedForm.publish_time.length > 0) {
|
if (modifiedForm.publish_date.length > 0 && modifiedForm.publish_time.length > 0) {
|
||||||
const publishDateTimeString = modifiedForm.publish_date + 'T' + modifiedForm.publish_time;
|
const publishDateTimeString = modifiedForm.publish_date + 'T' + modifiedForm.publish_time;
|
||||||
const publishDateTime = DateTime.fromISO(publishDateTimeString);
|
const publishDateTime = DateTime.fromISO(publishDateTimeString, {zone: timezone});
|
||||||
|
|
||||||
modifiedForm.publish_at = publishDateTime.toSeconds();
|
modifiedForm.publish_at = publishDateTime.toSeconds();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue