Fix an issue where status couldn’t be updated when editing a submission in the control panel

Author: engram-design

src/controllers/SubmissionsController.php

@@ -3,6 +3,7 @@
 
 use verbb\workflow\Workflow;
 use verbb\workflow\elements\Submission;
+use verbb\workflow\models\Review;
 
 use Craft;
 use craft\db\Table;
@@ -48,9 +49,34 @@ public function actionSaveSubmission(): ?Response
 
         $request = Craft::$app->getRequest();
         $session = Craft::$app->getSession();
+        $currentUser = Craft::$app->getUser()->getIdentity();
 
         $submissionId = $request->getParam('submissionId');
         $submission = Craft::$app->getElements()->getElementById($submissionId);
+        $status = $request->getParam('status');
+
+        if (!$submission) {
+            $session->setError(Craft::t('workflow', 'Unable to find submission.'));
+
+            return null;
+        }
+
+        // Skip if there's nothing to change
+        if ($submission->status !== $status) {
+            // If trying to approve their own submission, fail
+            if ($status === Review::STATUS_APPROVED && $submission->editorId === $currentUser->id) {
+                $session->setError(Craft::t('workflow', 'You cannot approve your own submission.'));
+
+                Craft::$app->getUrlManager()->setRouteParams([
+                    'submission' => $submission,
+                    'errors' => $submission->getErrors(),
+                ]);
+
+                return null;
+            } else {
+                Workflow::$plugin->getSubmissions()->triggerSubmissionStatus($status, $submission);
+            }
+        }
 
         if (!Craft::$app->getElements()->saveElement($submission)) {
             $session->setError(Craft::t('workflow', 'Unable to save submission.'));
@@ -63,7 +89,7 @@ public function actionSaveSubmission(): ?Response
             return null;
         }
 
-        $session->setNotice(Craft::t('workflow', 'Comment saved successfully.'));
+        $session->setNotice(Craft::t('workflow', 'Submission saved successfully.'));
 
         return $this->redirectToPostedUrl($submission);
     }

src/templates/submissions/_edit.html

@@ -220,7 +220,7 @@ <h5 class="heading">{{ 'Updated at' | t('app') }}</h5>
     onOptionSelect: function(data) {
         var value = $(data).data('value');
         var label = $(data).data('label');
-        $('#statusId').val(value);
+        $('[name="status"]').val(value);
 
         var html = '<span class="status ' + value + '"></span>' + label;
         $statusSelect.html(html);

src/translations/en/workflow.php

@@ -139,7 +139,7 @@
     'This content has been changed.' => 'This content has been changed.',
     'This content has been removed.' => 'This content has been removed.',
     'Unable to save submission.' => 'Unable to save submission.',
-    'Comment saved successfully.' => 'Comment saved successfully.',
+    'Submission saved successfully.' => 'Submission saved successfully.',
     'Unable to delete submission.' => 'Unable to delete submission.',
     'Submission deleted.' => 'Submission deleted.',
     'Unable to delete review.' => 'Unable to delete review.',