diff --git a/frontend/src/components/PageHistoryOverlay.vue b/frontend/src/components/PageHistoryOverlay.vue index 5ee259bc4..ebaae4fd4 100644 --- a/frontend/src/components/PageHistoryOverlay.vue +++ b/frontend/src/components/PageHistoryOverlay.vue @@ -264,7 +264,12 @@ import { useI18n } from 'vue-i18n' import { useRouter } from 'vue-router' import * as monaco from 'monaco-editor' -import { renderVersionSource, saveVersionSource, versionContentType } from '@/helpers/pageVersions' +import { + renderVersionSource, + saveVersionSource, + versionContentType, + versionPageProps +} from '@/helpers/pageVersions' import { confirm, dialog } from '@/composables/dialog' import { notify } from '@/composables/notify' @@ -627,18 +632,14 @@ function branchFrom(version) { const content = full.content ?? '' const resp = await API_CLIENT.post(`sites/${siteStore.id}/pages`, { json: { + // -> Everything the page was, as far as a new page may be given it; see `versionPageProps` + ...versionPageProps(full), path: target.path, title: target.title, locale: pageStore.locale, editor: full.meta?.editor || pageStore.editor, content, render: await renderOf(full), - description: full.meta?.description ?? '', - icon: full.meta?.icon ?? '', - tags: full.meta?.tags ?? [], - // -> A version that was scheduled carries dates this new page has not got, and the API - // rightly refuses that combination - publishState: full.meta?.publishState === 'published' ? 'published' : 'draft', reasonForChange: t('history.branchReason', { date: humanizeDate(full.versionDate) }) } }).json() diff --git a/frontend/src/components/PageTags.vue b/frontend/src/components/PageTags.vue index 05984b362..64045dcdd 100644 --- a/frontend/src/components/PageTags.vue +++ b/frontend/src/components/PageTags.vue @@ -30,7 +30,7 @@ v-if="props.edit" outlined v-model="pageStore.tags" - :options="state.tags" + :options="sortedTags" dense options-dense use-input @@ -45,7 +45,7 @@ diff --git a/frontend/src/pages/InboxReview.vue b/frontend/src/pages/InboxReview.vue index 04d4f6748..3d76f8a43 100644 --- a/frontend/src/pages/InboxReview.vue +++ b/frontend/src/pages/InboxReview.vue @@ -178,9 +178,9 @@ const { t } = useI18n() // META -useMeta({ +useMeta(() => ({ title: t('inbox.pendingReview') -}) +})) // DATA diff --git a/frontend/src/pages/InboxWatching.vue b/frontend/src/pages/InboxWatching.vue index b8427fa78..e5faafba3 100644 --- a/frontend/src/pages/InboxWatching.vue +++ b/frontend/src/pages/InboxWatching.vue @@ -93,9 +93,9 @@ const { t } = useI18n() // META -useMeta({ +useMeta(() => ({ title: t('inbox.watching') -}) +})) // DATA diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue index f9728f035..2f55d0e36 100644 --- a/frontend/src/pages/Login.vue +++ b/frontend/src/pages/Login.vue @@ -30,9 +30,9 @@ const { t } = useI18n() // META -useMeta({ +useMeta(() => ({ title: t('auth.login.title') -}) +}))