Merge branch 'craft-4' of https://github.com/verbb/workflow into craft-5

# Conflicts: # CHANGELOG.md # composer.json
verbb · Nov 28, 2024 · 2dc2699 · 2dc2699
2 parents be3a422 + adb64b5
commit 2dc2699
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -43,6 +43,12 @@
 - Now requires PHP `8.2.0+`.
 - Now requires Craft `5.0.0+`.
 
+## 2.0.13 - 2024-11-28
+
+### Fixed
+- Fix when deleting a Craft User that owned a review, would also delete that review.
+- Fix an error when approving a submission. (thanks @iainsaxon).
+
 ## 2.0.12 - 2024-10-09
 
 ### Fixed

diff --git a/src/Workflow.php b/src/Workflow.php
@@ -43,7 +43,7 @@ class Workflow extends Plugin
     // =========================================================================
 
     public bool $hasCpSettings = true;
-    public string $schemaVersion = '2.5.0';
+    public string $schemaVersion = '2.6.0';
     public string $minVersionRequired = '1.7.0';
 
 

diff --git a/src/elements/Submission.php b/src/elements/Submission.php
@@ -187,7 +187,7 @@ public function getSupportedSites(): array
             return $owner->getSupportedSites();
         }
 
-        return Craft::$app->getSites()->getAllSites();
+        return Craft::$app->getSites()->getAllSiteIds();
     }
 
     public function setOwner(Entry $owner): void

diff --git a/src/migrations/Install.php b/src/migrations/Install.php
@@ -81,7 +81,7 @@ public function addForeignKeys(): void
         $this->addForeignKey(null, '{{%workflow_reviews}}', 'elementId', '{{%elements}}', 'id', 'SET NULL', null);
         $this->addForeignKey(null, '{{%workflow_reviews}}', 'elementSiteId', '{{%sites}}', 'id', 'CASCADE', null);
         $this->addForeignKey(null, '{{%workflow_reviews}}', 'draftId', '{{%drafts}}', 'id', 'SET NULL', null);
-        $this->addForeignKey(null, '{{%workflow_reviews}}', 'userId', '{{%users}}', 'id', 'CASCADE', null);
+        $this->addForeignKey(null, '{{%workflow_reviews}}', 'userId', '{{%users}}', 'id', 'SET NULL', null);
     }
 
     public function dropTables(): void

diff --git a/src/migrations/m241030_000000_user_fk.php b/src/migrations/m241030_000000_user_fk.php
@@ -0,0 +1,36 @@
+<?php
+namespace verbb\workflow\migrations;
+
+use craft\db\Migration;
+use craft\db\Query;
+use craft\helpers\MigrationHelper;
+
+use Throwable;
+
+class m241030_000000_user_fk extends Migration
+{
+    /**
+     * @inheritdoc
+     */
+    public function safeUp(): bool
+    {
+        MigrationHelper::dropAllForeignKeysOnTable('{{%workflow_reviews}}');
+
+        $this->addForeignKey(null, '{{%workflow_reviews}}', 'submissionId', '{{%workflow_submissions}}', 'id', 'CASCADE', null);
+        $this->addForeignKey(null, '{{%workflow_reviews}}', 'elementId', '{{%elements}}', 'id', 'SET NULL', null);
+        $this->addForeignKey(null, '{{%workflow_reviews}}', 'elementSiteId', '{{%sites}}', 'id', 'CASCADE', null);
+        $this->addForeignKey(null, '{{%workflow_reviews}}', 'draftId', '{{%drafts}}', 'id', 'SET NULL', null);
+        $this->addForeignKey(null, '{{%workflow_reviews}}', 'userId', '{{%users}}', 'id', 'SET NULL', null);
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function safeDown(): bool
+    {
+        echo "m241030_000000_user_fk cannot be reverted.\n";
+        return false;
+    }
+}
diff --git a/src/models/Review.php b/src/models/Review.php
@@ -178,7 +178,7 @@ public function getUserUrl(): ?Markup
             return Template::raw($user);
         }
 
-        return null;
+        return Template::raw(Craft::t('workflow', '[Deleted User]'));
     }
 
     public function getStatusName(): ?string

diff --git a/src/templates/_sidebar/_layout.html b/src/templates/_sidebar/_layout.html
@@ -37,7 +37,7 @@
 
                     <div id="{{ anchorKey }}" class="workflow-history-info hidden">
                         <div class="instructions">
-                            <p>{{ review.userUrl }} {{ '{status} this submission on {date}.' | t('workflow', { status: statusText, date: review.dateCreated | datetime('medium') }) }}</p>
+                            <p>{{ review.getUserUrl() }} {{ '{status} this submission on {date}.' | t('workflow', { status: statusText, date: review.dateCreated | datetime('medium') }) }}</p>
 
                             {% if review.notes %}
                                 <p class="code">{{ '{role} Notes: “{note}”' | t('workflow', { role: review.roleName, note: review.notes }) | raw }}</p>

diff --git a/src/templates/_sidebar/publisher-pane.html b/src/templates/_sidebar/publisher-pane.html
@@ -13,7 +13,7 @@
 
             <div id="workflow-submission-info" class="hidden">
                 <div class="instructions">
-                    <p>{{ review.userUrl }} {{ 'submitted this entry for review on {date}. Please review this entry before approving' | t('workflow', { date: review.dateCreated | datetime('medium') }) }}</p>
+                    <p>{{ review.getUserUrl() }} {{ 'submitted this entry for review on {date}. Please review this entry before approving' | t('workflow', { date: review.dateCreated | datetime('medium') }) }}</p>
 
                     {% if review.notes %}
                         <p class="code">{{ '{role} Notes: “{note}”' | t('workflow', { role: review.roleName, note: review.notes }) | raw }}</p>

diff --git a/src/templates/_sidebar/reviewer-pane.html b/src/templates/_sidebar/reviewer-pane.html
@@ -14,7 +14,7 @@
 
                 <div id="workflow-submission-info" class="hidden">
                     <div class="instructions">
-                        <p>{{ review.userUrl }} {{ 'submitted this entry for review on {date}. Please review this entry before approving' | t('workflow', { date: review.dateCreated | datetime('medium') }) }}</p>
+                        <p>{{ review.getUserUrl() }} {{ 'submitted this entry for review on {date}. Please review this entry before approving' | t('workflow', { date: review.dateCreated | datetime('medium') }) }}</p>
 
                         {% if review.notes %}
                             <p class="code">{{ '{role} Notes: “{note}”' | t('workflow', { role: review.roleName, note: review.notes }) | raw }}</p>

diff --git a/src/templates/reviews/_includes/_review.html b/src/templates/reviews/_includes/_review.html
@@ -2,7 +2,7 @@
 {% set statusText = (review.status == 'pending') ? 'created' | t('workflow') : review.status %}
 
 <div class="workflow-compare-review-heading">
-    <label class="review-count">{{ review.userUrl }} {{ '{status} this submission on {date}.' | t('workflow', { status: statusText, date: review.dateCreated | datetime('medium') }) }}</label>
+    <label class="review-count">{{ review.getUserUrl() }} {{ '{status} this submission on {date}.' | t('workflow', { status: statusText, date: review.dateCreated | datetime('medium') }) }}</label>
     <label class="review-status-badge {{ review.status }}">{{ statusText }}</label>
 </div>
 

diff --git a/src/templates/submissions/_edit.html b/src/templates/submissions/_edit.html
@@ -124,7 +124,7 @@
                     </div>
 
                     <div class="workflow-single-review-info">
-                        <p>{{ review.userUrl }} {{ '{status} this submission on {date}.' | t('workflow', { status: statusText, date: review.dateCreated | datetime('medium') }) }}</p>
+                        <p>{{ review.getUserUrl() }} {{ '{status} this submission on {date}.' | t('workflow', { status: statusText, date: review.dateCreated | datetime('medium') }) }}</p>
 
                         {% if review.notes %}
                             <p>{{ '{role} Notes: “{note}”' | t('workflow', { role: review.roleName, note: review.notes }) | raw }}</p>