Skip to content

pkp/pkp-lib#12593 discussion-related template migration #5567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Vitaliy-1 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

pkp/pkp-lib#12593 discussion-related template migration #5567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bcede55
pkp/pkp-lib#12593 Migrate discussion-related templates
Vitaliy-1 Jun 1, 2026
c326128
pkp/pkp-lib#12593 Fix 3.4 migration
Vitaliy-1 Aug 3, 2026
00dbe32
pkp/pkp-lib#12593 Make key mandatory for default templates
Vitaliy-1 Aug 7, 2026
a9f7e98
Submodule update ##Vitaliy-1/i12593_template_migration##
Vitaliy-1 Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions classes/migration/upgrade/v3_4_0/I5716_EmailTemplateAssignments.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
namespace APP\migration\upgrade\v3_4_0;

use Illuminate\Support\Collection;
use PKP\mail\mailables\DiscussionCopyediting;
use PKP\mail\mailables\DiscussionProduction;
use PKP\mail\mailables\DiscussionReview;
use PKP\mail\mailables\DiscussionSubmission;

class I5716_EmailTemplateAssignments extends \PKP\migration\upgrade\v3_4_0\I5716_EmailTemplateAssignments
{
Expand All @@ -40,10 +36,10 @@ protected function getContextIdColumn(): string
protected function getDiscussionTemplates(): Collection
{
return collect([
DiscussionSubmission::getEmailTemplateKey(),
DiscussionReview::getEmailTemplateKey(),
DiscussionCopyediting::getEmailTemplateKey(),
DiscussionProduction::getEmailTemplateKey(),
'DISCUSSION_NOTIFICATION_SUBMISSION',
'DISCUSSION_NOTIFICATION_REVIEW',
'DISCUSSION_NOTIFICATION_COPYEDITING',
'DISCUSSION_NOTIFICATION_PRODUCTION',
]);
}
}
9 changes: 5 additions & 4 deletions dbscripts/xml/upgrade.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@
</upgrade>

<upgrade minversion="3.3.0.0" maxversion="3.5.9.9">
<migration class="PKP\migration\upgrade\v3_6_0\PreflightCheckMigration" fallback="3.5.9.9" />
<migration class="PKP\migration\upgrade\v3_6_0\PreflightCheckMigration" fallback="3.5.9.9"/>
<migration class="PKP\migration\upgrade\v3_6_0\I10403_EmailTemplateUserGroupAccess"/>
<migration class="APP\migration\install\ReviewerRecommendationsMigration" />
<migration class="APP\migration\install\ReviewerRecommendationsMigration"/>
<migration class="APP\migration\upgrade\v3_6_0\I1660_ReviewerRecommendations"/>
<migration class="APP\migration\upgrade\v3_6_0\I10404_UpdateCategoryImageNameFields"/>
<migration class="PKP\migration\upgrade\v3_6_0\I4860_MigratePublicationVersion"/>
Expand All @@ -211,9 +211,9 @@
<migration class="PKP\migration\upgrade\v3_6_0\I11701_Notes"/>
<migration class="APP\migration\upgrade\v3_6_0\I11593_DOAJGenericPlugin"/>
<migration class="PKP\migration\upgrade\v3_6_0\I11917_TaskTemplateDueDate"/>
<migration class="PKP\migration\upgrade\v3_6_0\I11913_AssociatePublicationsWithReviewRounds"/>
<migration class="PKP\migration\upgrade\v3_6_0\I11913_AssociatePublicationsWithReviewRounds"/>
<migration class="PKP\migration\upgrade\v3_6_0\I857_ContributorRolesTypes"/>
<migration class="APP\migration\upgrade\v3_6_0\I12046_AssignMachineReadableRecommendationType"/>
<migration class="APP\migration\upgrade\v3_6_0\I12046_AssignMachineReadableRecommendationType"/>
<migration class="PKP\migration\upgrade\v3_6_0\I12108_RestrictEditTemplatesToUserGroups"/>
<migration class="PKP\migration\upgrade\v3_6_0\I12078_RemoveSettingTypeInCitationSettings"/>
<migration class="PKP\migration\upgrade\v3_6_0\I11971_RemoveShowTitleInUserGroups"/>
Expand All @@ -237,6 +237,7 @@
<migration class="PKP\migration\upgrade\v3_6_0\I11914_MigrateCreditRoles" />
<migration class="PKP\migration\upgrade\v3_6_0\I12841_CreateLogsDirectory" />
<migration class="PKP\migration\upgrade\v3_6_0\InstallEmailTemplates"/>
<migration class="PKP\migration\upgrade\v3_6_0\I12593_EmailToTaskTemplates"/>
<code function="rebuildSearchIndex" />
<note file="docs/release-notes/README-3.6.0" />
</upgrade>
Expand Down
2 changes: 1 addition & 1 deletion lib/pkp
Open in desktop
Submodule pkp updated 25 files
+3 −0 api/v1/contexts/PKPContextController.php
+9 −9 api/v1/editTaskTemplates/PKPEditTaskTemplateController.php
+2 −2 api/v1/editTaskTemplates/resources/TaskTemplateResource.php
+2 −4 api/v1/submissions/tasks/EditorialTaskController.php
+11 −0 classes/editorialTask/EditorialTask.php
+164 −5 classes/editorialTask/Repository.php
+64 −27 classes/editorialTask/Template.php
+2 −0 classes/editorialTask/TemplateVariables.php
+0 −4 classes/mail/Repository.php
+0 −59 classes/mail/mailables/DiscussionCopyediting.php
+0 −59 classes/mail/mailables/DiscussionProduction.php
+0 −59 classes/mail/mailables/DiscussionReview.php
+0 −59 classes/mail/mailables/DiscussionSubmission.php
+2 −2 classes/migration/install/SubmissionsMigration.php
+254 −0 classes/migration/upgrade/v3_6_0/I12593_EmailToTaskTemplates.php
+22 −11 classes/userGroup/UserGroup.php
+1 −0 controllers/grid/admin/languages/AdminLanguageGridHandler.php
+2 −2 controllers/grid/languages/LanguageGridHandler.php
+5 −0 controllers/grid/languages/form/InstallLanguageForm.php
+0 −46 controllers/grid/queries/traits/StageMailable.php
+12 −11 controllers/grid/users/stageParticipant/StageParticipantGridHandler.php
+37 −37 controllers/grid/users/stageParticipant/form/PKPStageParticipantNotifyForm.php
+16 −16 cypress/tests/integration/emailTemplates/EmailTemplates.cy.js
+18 −0 dtd/taskTemplates.dtd
+1 −1 pages/about/AboutContextHandler.php
10 changes: 0 additions & 10 deletions registry/emailTemplates.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,6 @@
<email key="REVISED_VERSION_NOTIFY" name="mailable.revisedVersionNotify.name" subject="emails.revisedVersionNotify.subject" body="emails.revisedVersionNotify.body"/>
<email key="STATISTICS_REPORT_NOTIFICATION" name="mailable.statisticsReportNotify.name" subject="emails.statisticsReportNotification.subject" body="emails.statisticsReportNotification.body"/>
<email key="ANNOUNCEMENT" name="mailable.announcementNotify.name" subject="emails.announcement.subject" body="emails.announcement.body"/>
<email key="DISCUSSION_NOTIFICATION_SUBMISSION" name="mailable.discussionSubmission.name" subject="emails.discussion.subject" body="emails.discussion.body"/>
<email key="DISCUSSION_NOTIFICATION_REVIEW" name="mailable.discussionReview.name" subject="emails.discussion.subject" body="emails.discussion.body"/>
<email key="DISCUSSION_NOTIFICATION_COPYEDITING" name="mailable.discussionCopyediting.name" subject="emails.discussion.subject" body="emails.discussion.body"/>
<email key="DISCUSSION_NOTIFICATION_PRODUCTION" name="mailable.discussionProduction.name" subject="emails.discussion.subject" body="emails.discussion.body"/>
<email key="COPYEDIT_REQUEST" name="mailable.copyeditRequest.name" alternateTo="DISCUSSION_NOTIFICATION_COPYEDITING" subject="emails.copyeditRequest.subject" body="emails.copyeditRequest.body"/>
<email key="EDITOR_ASSIGN_SUBMISSION" name="mailable.editorAssignedManual.name" alternateTo="DISCUSSION_NOTIFICATION_SUBMISSION" subject="emails.editorAssign.subject" body="emails.editorAssign.body"/>
<email key="EDITOR_ASSIGN_REVIEW" name="mailable.editorAssignedManual.name" alternateTo="DISCUSSION_NOTIFICATION_REVIEW" subject="emails.editorAssign.subject" body="emails.editorAssignReview.body"/>
<email key="EDITOR_ASSIGN_PRODUCTION" name="mailable.editorAssignedManual.name" alternateTo="DISCUSSION_NOTIFICATION_PRODUCTION" subject="emails.editorAssign.subject" body="emails.editorAssignProduction.body"/>
<email key="LAYOUT_REQUEST" name="mailable.layoutRequest.name" alternateTo="DISCUSSION_NOTIFICATION_PRODUCTION" subject="emails.layoutRequest.subject" body="emails.layoutRequest.body"/>
<email key="LAYOUT_COMPLETE" name="mailable.layoutComplete.name" alternateTo="DISCUSSION_NOTIFICATION_PRODUCTION" subject="emails.layoutComplete.subject" body="emails.layoutComplete.body"/>
<email key="VERSION_CREATED" name="mailable.versionCreated.name" subject="emails.versionCreated.subject" body="emails.versionCreated.body"/>
<email key="EDITORIAL_REMINDER" name="mailable.editorialReminder.name" subject="emails.editorialReminder.subject" body="emails.editorialReminder.body"/>
<email key="SUBMISSION_SAVED_FOR_LATER" name="mailable.submissionSavedForLater.name" subject="emails.submissionSavedForLater.subject" body="emails.submissionSavedForLater.body"/>
Expand Down
23 changes: 23 additions & 0 deletions registry/taskTemplates.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE templates SYSTEM "../lib/pkp/dtd/taskTemplates.dtd">
<!--
* registry/taskTemplates.xml
*
* Copyright (c) 2014-2026 Simon Fraser University
* Copyright (c) 2003-2026 John Willinsky
* Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
*
* XML file including information about default task and discussion templates.
-->
<templates>
<template title="mailable.discussionSubmission.name" description="emails.discussion.body" key="DISCUSSION_NOTIFICATION_SUBMISSION" stageId="WORKFLOW_STAGE_ID_SUBMISSION"/>
<template title="mailable.discussionReview.name" description="emails.discussion.body" key="DISCUSSION_NOTIFICATION_REVIEW" stageId="WORKFLOW_STAGE_ID_EXTERNAL_REVIEW"/>
<template title="mailable.discussionCopyediting.name" description="emails.discussion.body" key="DISCUSSION_NOTIFICATION_COPYEDITING" stageId="WORKFLOW_STAGE_ID_EDITING"/>
<template title="mailable.discussionProduction.name" description="emails.discussion.body" key="DISCUSSION_NOTIFICATION_PRODUCTION" stageId="WORKFLOW_STAGE_ID_PRODUCTION"/>
<template title="mailable.copyeditRequest.name" description="emails.copyeditRequest.body" key="COPYEDIT_REQUEST" stageId="WORKFLOW_STAGE_ID_EDITING"/>
<template title="mailable.editorAssignedManual.name" description="emails.editorAssign.body" key="EDITOR_ASSIGN_SUBMISSION" stageId="WORKFLOW_STAGE_ID_SUBMISSION"/>
<template title="mailable.editorAssignedManual.name" description="emails.editorAssignReview.body" key="EDITOR_ASSIGN_REVIEW" stageId="WORKFLOW_STAGE_ID_EXTERNAL_REVIEW"/>
<template title="mailable.editorAssignedManual.name" description="emails.editorAssignProduction.body" key="EDITOR_ASSIGN_PRODUCTION" stageId="WORKFLOW_STAGE_ID_PRODUCTION"/>
<template title="mailable.layoutRequest.name" description="emails.layoutRequest.body" key="LAYOUT_REQUEST" stageId="WORKFLOW_STAGE_ID_PRODUCTION"/>
<template title="mailable.layoutComplete.name" description="emails.layoutComplete.body" key="LAYOUT_COMPLETE" stageId="WORKFLOW_STAGE_ID_PRODUCTION"/>
</templates>
Loading