#8933 Fix migration - nullable setting_type & inserting empty event l…

…og issue
pkp · May 22, 2023 · 379e695 · 379e695
1 parent d875555
commit 379e695
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/classes/log/event/DAO.php b/classes/log/event/DAO.php
@@ -64,6 +64,9 @@ public function __construct()
             public function setCustomProps(array $props)
             {
                 $cleanProps = $this->validateCustomProps($props);
+                if (empty($cleanProps)) {
+                    return;
+                }
                 $this->customProps = $cleanProps;
             }
 

diff --git a/classes/migration/install/LogMigration.php b/classes/migration/install/LogMigration.php
@@ -52,7 +52,7 @@ public function up(): void
 			$table->string('locale', 14)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
-            $table->string('setting_type', 6)->comment('(bool|int|float|string|object)')->nullable()->default(null);
+            $table->string('setting_type', 6)->comment('(bool|int|float|string|object)')->nullable();
             $table->unique(['log_id', 'setting_name', 'locale'], 'event_log_settings_unique');
         });
 

diff --git a/classes/migration/upgrade/v3_4_0/I8933_EventLogLocalized.php b/classes/migration/upgrade/v3_4_0/I8933_EventLogLocalized.php
@@ -40,7 +40,7 @@ public function up(): void
             $table->string('locale', 14)->default('')->after('log_id');
             $table->dropUnique('event_log_settings_unique');
             $table->unique(['log_id', 'locale', 'setting_name'], 'event_log_settings_unique');
-            $table->string('setting_type', 6)->default(null)->change();
+            $table->string('setting_type', 6)->nullable()->change();
         });
 
         // Events can be triggered without a user, e.g., in schedule tasks

diff --git a/controllers/grid/users/stageParticipant/form/PKPStageParticipantNotifyForm.php b/controllers/grid/users/stageParticipant/form/PKPStageParticipantNotifyForm.php
@@ -370,15 +370,13 @@ public function _logEventAndCreateNotification($request, $submission)
     {
         $currentUser = $request->getUser();
         $eventLog = Repo::eventLog()->newDataObject([
-            [
-                'assocType' => PKPApplication::ASSOC_TYPE_SUBMISSION,
-                'assocId' => $submission->getId(),
-                'eventType' => EventLogEntry::SUBMISSION_LOG_MESSAGE_SENT,
-                'userId' => Validation::loggedInAs() ?? $currentUser->getId(),
-                'message' => 'informationCenter.history.messageSent',
-                'isTranslated' => 0,
-                'dateLogged' => Core::getCurrentDate()
-            ]
+            'assocType' => PKPApplication::ASSOC_TYPE_SUBMISSION,
+            'assocId' => $submission->getId(),
+            'eventType' => EventLogEntry::SUBMISSION_LOG_MESSAGE_SENT,
+            'userId' => Validation::loggedInAs() ?? $currentUser->getId(),
+            'message' => 'informationCenter.history.messageSent',
+            'isTranslated' => 0,
+            'dateLogged' => Core::getCurrentDate()
         ]);
         Repo::eventLog()->add($eventLog);