Merge branch 'removesExceptionTriggerForStable330-888' into 'stable-3…

…_3_0' Removes exception trigger of type P1PioException. See merge request softwares-pkp/plugins_ojs/OASwitchboard!38
lepidus · Sep 20, 2024 · 7c7c0e2 · 7c7c0e2
2 parents bca0902 + 888e896
commit 7c7c0e2
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/classes/Message.inc.php b/classes/Message.inc.php
@@ -40,7 +40,7 @@ public function sendToOASwitchboard($hookName, $args)
                     $this->registerSubmissionEventLog($request, $submission, $error);
                 }
             }
-            throw $e;
+            error_log($e->getMessage());
         }
     }
 

diff --git a/cypress/tests/Test3_sendMessageError.cy.js b/cypress/tests/Test3_sendMessageError.cy.js
@@ -8,7 +8,6 @@ describe('Error when submission is published', function () {
         cy.get('.modal__content button:contains("Unpublish")').click();
         cy.get('.pkpPublication > .pkpHeader button:contains("Publish")').click();
         cy.get('.pkpFormPage__footer button:contains("Publish")').click();
-        cy.reload();
 
         cy.get('.app__notifications').contains("We don't have the mandatory data for sending the message to the OA Switchboard, please check the submission activity log to understand the pending requirements.");
         cy.get('.app__notifications').contains("The article must have a DOI associated.");

diff --git a/js/Workflow.js b/js/Workflow.js
@@ -33,14 +33,6 @@
     }
 
     pkp.eventBus.$on('form-success', (formId, data) => {
-        if (formId !== pkp.const.FORM_PUBLISH) {
-            return;
-        }
-
-        if (data.status !== pkp.const.STATUS_PUBLISHED) {
-            return;
-        }
-
         $.ajax({
             type: 'POST',
             url: $.pkp.plugins.generic.oaswitchboardplugin.notificationUrl,

diff --git a/version.xml b/version.xml
@@ -12,8 +12,8 @@
 <version>
 	<application>OASwitchboard</application>
 	<type>plugins.generic</type>
-	<release>1.1.1.1</release>
-	<date>2024-08-12</date>
+	<release>1.1.1.2</release>
+	<date>2024-09-20</date>
 	<lazy-load>1</lazy-load>
 	<class>OASwitchboardPlugin</class>
 </version>
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,7 @@ public function sendToOASwitchboard($hookName, $args) @@
                         $this->registerSubmissionEventLog($request, $submission, $error);
                     }
                 }
-                throw $e;
+                error_log($e->getMessage());
             }
         }
@@ Expand Down @@