pkg/web_api/mapfixes.go

@@ -448,7 +448,12 @@ func (svc *Service) ActionMapfixRequestChanges(ctx context.Context, params api.A
 	target_status := model.MapfixStatusChangesRequested
 	update := service.NewMapfixUpdate()
 	update.SetStatusID(target_status)
-	allow_statuses := []model.MapfixStatus{model.MapfixStatusValidated, model.MapfixStatusAcceptedUnvalidated, model.MapfixStatusSubmitted}
+	allow_statuses := []model.MapfixStatus{
+		model.MapfixStatusUploaded,
+		model.MapfixStatusValidated,
+		model.MapfixStatusAcceptedUnvalidated,
+		model.MapfixStatusSubmitted,
+	}
 	err = svc.inner.UpdateMapfixIfStatus(ctx, params.MapfixID, allow_statuses, update)
 	if err != nil {
 		return err

pkg/web_api/submissions.go

@@ -437,7 +437,12 @@ func (svc *Service) ActionSubmissionRequestChanges(ctx context.Context, params a
 	target_status := model.SubmissionStatusChangesRequested
 	update := service.NewSubmissionUpdate()
 	update.SetStatusID(target_status)
-	allowed_statuses := []model.SubmissionStatus{model.SubmissionStatusValidated, model.SubmissionStatusAcceptedUnvalidated, model.SubmissionStatusSubmitted}
+	allowed_statuses := []model.SubmissionStatus{
+		model.SubmissionStatusUploaded,
+		model.SubmissionStatusValidated,
+		model.SubmissionStatusAcceptedUnvalidated,
+		model.SubmissionStatusSubmitted,
+	}
 	err = svc.inner.UpdateSubmissionIfStatus(ctx, params.SubmissionID, allowed_statuses, update)
 	if err != nil {
 		return err

web/src/app/_components/review/ReviewButtons.tsx

@@ -229,7 +229,7 @@ const ReviewButtons: React.FC<ReviewButtonsProps> = ({
                 });
             }
 
-            if (StatusMatches(status, [Status.Validated, Status.AcceptedUnvalidated, Status.Submitted]) && !is_submitter) {
+            if (StatusMatches(status, [Status.Uploaded, Status.Validated, Status.AcceptedUnvalidated, Status.Submitted]) && !is_submitter) {
                 reviewerButtons.push({
                     action: ReviewActions.RequestChanges,
                     color: "warning",