Merge pull request #3738 from NateWr/i8592_notification_subscriptions

pkp/pkp-lib#8592 Fix site-wide notification subscriptions form
pkp · Feb 2, 2023 · 384f241 · 384f241
2 parents a9bad2d + c160e16
commit 384f241
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/classes/notification/form/NotificationSettingsForm.php b/classes/notification/form/NotificationSettingsForm.php
@@ -24,7 +24,7 @@ class NotificationSettingsForm extends PKPNotificationSettingsForm
     /**
      * @copydoc PKPNotificationSettingsForm::getNotificationSettingsCategories()
      */
-    public function getNotificationSettingCategories(Context $context)
+    public function getNotificationSettingCategories(?Context $context = null)
     {
         $categories = parent::getNotificationSettingCategories($context);
         for ($i = 0; $i < count($categories); $i++) {

diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
@@ -189,6 +189,7 @@
 		<migration class="PKP\migration\upgrade\v3_4_0\I8508_ConvertCurrentLogFile"/>
 		<migration class="APP\migration\upgrade\v3_4_0\I8027_DoiVersioning"/>
 		<migration class="APP\migration\upgrade\v3_4_0\I6306_EnableCategories"/>
+		<migration class="PKP\migration\upgrade\v3_4_0\I8592_SiteNotificationSubscriptions"/>
 		<data file="dbscripts/xml/upgrade/3.4.0_preupdate_email_templates.xml" />
 		<note file="docs/release-notes/README-3.4.0" />
 	</upgrade>

diff --git a/lib/pkp b/lib/pkp
+2 −4		api/v1/emailTemplates/PKPEmailTemplateHandler.php
+2 −18		classes/author/Repository.php
+1 −2		classes/decision/steps/Email.php
+7 −20		classes/emailTemplate/Collector.php
+12 −3		classes/emailTemplate/DAO.php
+3 −4		classes/emailTemplate/Repository.php
+1 −2		classes/mail/Repository.php
+35 −0		classes/migration/upgrade/v3_4_0/I8592_SiteNotificationSubscriptions.php
+5 −7		classes/notification/NotificationSubscriptionSettingsDAO.php
+4 −4		classes/notification/form/PKPNotificationSettingsForm.php
+12 −14		classes/session/SessionManager.php
+0 −61		classes/submission/PKPSubmission.php
+1 −2		controllers/grid/queries/form/QueryForm.php
+2 −4		controllers/grid/users/reviewer/form/AdvancedSearchReviewerForm.php
+1 −2		controllers/grid/users/reviewer/form/ReviewerForm.php
+1 −2		controllers/grid/users/stageParticipant/form/PKPStageParticipantNotifyForm.php
+0 −70		controllers/informationCenter/linkAction/SubmissionInfoCenterLinkAction.php
+17 −8		js/controllers/grid/users/reviewer/AdvancedReviewerSearchHandler.js
+1 −1		pages/authorDashboard/PKPAuthorDashboardHandler.php
+1 −1		pages/workflow/PKPWorkflowHandler.php