From c2d4bb7e845c9a120c6ece211039dbd897cefc5d Mon Sep 17 00:00:00 2001 From: Dimitris Efstathiou Date: Mon, 7 Apr 2025 20:58:40 +0300 Subject: [PATCH 1/4] pkp/pkp-lib#4860 Initial Commit --- public/globals.js | 2 +- src/components/ListPanel/doi/DoiListPanel.vue | 2 +- src/components/ListPanel/doi/DoiListPanelOJS.vue | 2 +- src/components/ListPanel/doi/DoiListPanelOMP.vue | 2 +- src/components/ListPanel/doi/DoiListPanelOPS.vue | 2 +- .../publication/WorkflowPublicationVersionControl.vue | 4 +++- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/public/globals.js b/public/globals.js index 339aeba22..bca5073ef 100644 --- a/public/globals.js +++ b/public/globals.js @@ -699,7 +699,7 @@ window.pkp = { 'publication.unschedule': 'Unschedule', 'publication.unschedule.confirm': "Are you sure you don't want this scheduled for publication?", - 'publication.version': 'Version {$version}', + 'publication.version': '{$version}', 'publication.version.all': 'All Versions', 'publication.version.confirm': 'Are you sure you want to create a new version?', diff --git a/src/components/ListPanel/doi/DoiListPanel.vue b/src/components/ListPanel/doi/DoiListPanel.vue index 8d1933c4f..bebc5d487 100644 --- a/src/components/ListPanel/doi/DoiListPanel.vue +++ b/src/components/ListPanel/doi/DoiListPanel.vue @@ -921,7 +921,7 @@ export default { return { id: publication.id, isCurrentVersion: item.currentPublicationId === publication.id, - versionNumber: publication.version, + versionNumber: publication.versionDataDisplay, urlPublished: publication.urlPublished, datePublished: publication.datePublished, }; diff --git a/src/components/ListPanel/doi/DoiListPanelOJS.vue b/src/components/ListPanel/doi/DoiListPanelOJS.vue index b4f34e8ba..5445ad993 100644 --- a/src/components/ListPanel/doi/DoiListPanelOJS.vue +++ b/src/components/ListPanel/doi/DoiListPanelOJS.vue @@ -19,7 +19,7 @@ export default { originalItem.publications.forEach((publication) => { const isCurrentVersion = publication.id === this.getCurrentPublication(originalItem).id; - const versionNumber = publication.version; + const versionNumber = publication.versionDataDisplay; if (this.enabledDoiTypes.includes('publication')) { let doiObject = publication.doiObject; diff --git a/src/components/ListPanel/doi/DoiListPanelOMP.vue b/src/components/ListPanel/doi/DoiListPanelOMP.vue index 12d444676..c7f986a64 100644 --- a/src/components/ListPanel/doi/DoiListPanelOMP.vue +++ b/src/components/ListPanel/doi/DoiListPanelOMP.vue @@ -17,7 +17,7 @@ export default { originalItem.publications.forEach((publication) => { const isCurrentVersion = publication.id === this.getCurrentPublication(originalItem).id; - const versionNumber = publication.version; + const versionNumber = publication.versionDataDisplay; // Submissions if (this.enabledDoiTypes.includes('publication')) { diff --git a/src/components/ListPanel/doi/DoiListPanelOPS.vue b/src/components/ListPanel/doi/DoiListPanelOPS.vue index 936691a11..1feb46342 100644 --- a/src/components/ListPanel/doi/DoiListPanelOPS.vue +++ b/src/components/ListPanel/doi/DoiListPanelOPS.vue @@ -17,7 +17,7 @@ export default { originalItem.publications.forEach((publication) => { const isCurrentVersion = publication.id === this.getCurrentPublication(originalItem).id; - const versionNumber = publication.version; + const versionNumber = publication.versionDataDisplay; // Submissions if (this.enabledDoiTypes.includes('publication')) { diff --git a/src/pages/workflow/components/publication/WorkflowPublicationVersionControl.vue b/src/pages/workflow/components/publication/WorkflowPublicationVersionControl.vue index cce894b92..f674c9dc9 100644 --- a/src/pages/workflow/components/publication/WorkflowPublicationVersionControl.vue +++ b/src/pages/workflow/components/publication/WorkflowPublicationVersionControl.vue @@ -71,7 +71,9 @@ const statusProps = computed(() => { }); function getItemLabel(publication) { - const firstPart = t('publication.version', {version: publication.version}); + const firstPart = t('publication.version', { + version: publication.versionDataDisplay, + }); let secondPart = ''; if ( publication.status === pkp.const.STATUS_QUEUED && From ad5cd0d737b85bc8e4947fd93b2be97ad23f69d3 Mon Sep 17 00:00:00 2001 From: Dimitris Efstathiou Date: Tue, 15 Apr 2025 13:16:36 +0300 Subject: [PATCH 2/4] pkp/pkp-lib#4860 Review Changes - Fixes --- src/components/ListPanel/doi/DoiListPanel.vue | 2 +- src/components/ListPanel/doi/DoiListPanelOJS.vue | 2 +- src/components/ListPanel/doi/DoiListPanelOMP.vue | 2 +- src/components/ListPanel/doi/DoiListPanelOPS.vue | 2 +- .../publication/WorkflowPublicationVersionControl.vue | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/ListPanel/doi/DoiListPanel.vue b/src/components/ListPanel/doi/DoiListPanel.vue index bebc5d487..1749bbaee 100644 --- a/src/components/ListPanel/doi/DoiListPanel.vue +++ b/src/components/ListPanel/doi/DoiListPanel.vue @@ -921,7 +921,7 @@ export default { return { id: publication.id, isCurrentVersion: item.currentPublicationId === publication.id, - versionNumber: publication.versionDataDisplay, + versionNumber: publication.versionString, urlPublished: publication.urlPublished, datePublished: publication.datePublished, }; diff --git a/src/components/ListPanel/doi/DoiListPanelOJS.vue b/src/components/ListPanel/doi/DoiListPanelOJS.vue index 5445ad993..a4d899468 100644 --- a/src/components/ListPanel/doi/DoiListPanelOJS.vue +++ b/src/components/ListPanel/doi/DoiListPanelOJS.vue @@ -19,7 +19,7 @@ export default { originalItem.publications.forEach((publication) => { const isCurrentVersion = publication.id === this.getCurrentPublication(originalItem).id; - const versionNumber = publication.versionDataDisplay; + const versionNumber = publication.versionString; if (this.enabledDoiTypes.includes('publication')) { let doiObject = publication.doiObject; diff --git a/src/components/ListPanel/doi/DoiListPanelOMP.vue b/src/components/ListPanel/doi/DoiListPanelOMP.vue index c7f986a64..c6d2cd964 100644 --- a/src/components/ListPanel/doi/DoiListPanelOMP.vue +++ b/src/components/ListPanel/doi/DoiListPanelOMP.vue @@ -17,7 +17,7 @@ export default { originalItem.publications.forEach((publication) => { const isCurrentVersion = publication.id === this.getCurrentPublication(originalItem).id; - const versionNumber = publication.versionDataDisplay; + const versionNumber = publication.versionString; // Submissions if (this.enabledDoiTypes.includes('publication')) { diff --git a/src/components/ListPanel/doi/DoiListPanelOPS.vue b/src/components/ListPanel/doi/DoiListPanelOPS.vue index 1feb46342..af3f3cbf4 100644 --- a/src/components/ListPanel/doi/DoiListPanelOPS.vue +++ b/src/components/ListPanel/doi/DoiListPanelOPS.vue @@ -17,7 +17,7 @@ export default { originalItem.publications.forEach((publication) => { const isCurrentVersion = publication.id === this.getCurrentPublication(originalItem).id; - const versionNumber = publication.versionDataDisplay; + const versionNumber = publication.versionString; // Submissions if (this.enabledDoiTypes.includes('publication')) { diff --git a/src/pages/workflow/components/publication/WorkflowPublicationVersionControl.vue b/src/pages/workflow/components/publication/WorkflowPublicationVersionControl.vue index f674c9dc9..3175bcc10 100644 --- a/src/pages/workflow/components/publication/WorkflowPublicationVersionControl.vue +++ b/src/pages/workflow/components/publication/WorkflowPublicationVersionControl.vue @@ -72,7 +72,7 @@ const statusProps = computed(() => { function getItemLabel(publication) { const firstPart = t('publication.version', { - version: publication.versionDataDisplay, + version: publication.versionString, }); let secondPart = ''; if ( From 12664b803e1de835516dfa5b65bbb7b2a3087dff Mon Sep 17 00:00:00 2001 From: Dimitris Efstathiou Date: Wed, 28 May 2025 21:57:15 +0300 Subject: [PATCH 3/4] pkp/pkp-lib#4860 Remove publication.version locale key --- src/components/ListPanel/doi/DoiItemVersionModal.vue | 4 +--- .../publication/WorkflowPublicationVersionControl.vue | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/components/ListPanel/doi/DoiItemVersionModal.vue b/src/components/ListPanel/doi/DoiItemVersionModal.vue index b0eba9efb..f33f0df52 100644 --- a/src/components/ListPanel/doi/DoiItemVersionModal.vue +++ b/src/components/ListPanel/doi/DoiItemVersionModal.vue @@ -113,9 +113,7 @@ function getVersionHeader(version) { version.datePublished !== null ? `(${version.datePublished})` : t('publication.status.unpublished'); - return `${t('publication.version', { - version: version.versionNumber, - })} ${dateInfo}`; + return `${version.versionNumber} ${dateInfo}`; } diff --git a/src/pages/workflow/components/publication/WorkflowPublicationVersionControl.vue b/src/pages/workflow/components/publication/WorkflowPublicationVersionControl.vue index 3175bcc10..7bbfd8363 100644 --- a/src/pages/workflow/components/publication/WorkflowPublicationVersionControl.vue +++ b/src/pages/workflow/components/publication/WorkflowPublicationVersionControl.vue @@ -71,9 +71,7 @@ const statusProps = computed(() => { }); function getItemLabel(publication) { - const firstPart = t('publication.version', { - version: publication.versionString, - }); + const firstPart = publication.versionString; let secondPart = ''; if ( publication.status === pkp.const.STATUS_QUEUED && From b03db59348df8e84fcabc6f04974bfa2a0c01984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti-Jussi=20Nyg=C3=A5rd?= Date: Tue, 3 Jun 2025 14:04:43 +0200 Subject: [PATCH 4/4] Add list of public files to tinymce link action --- src/components/Form/fields/FieldRichTextarea.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/components/Form/fields/FieldRichTextarea.vue b/src/components/Form/fields/FieldRichTextarea.vue index 49f38b753..bea7ef0a2 100644 --- a/src/components/Form/fields/FieldRichTextarea.vue +++ b/src/components/Form/fields/FieldRichTextarea.vue @@ -157,6 +157,12 @@ export default { return ''; }, }, + linkList: { + type: Array, + default() { + return []; + }, + }, wordCountLabel: { type: String, default() { @@ -227,6 +233,7 @@ export default { statusbar: false, entity_encoding: 'raw', browser_spellcheck: true, + link_list: self.linkList, language: $.pkp?.plugins?.generic?.tinymceplugin?.tinymceParams?.language, language_url: