Changes sync

CHANGELOG.rst

@@ -6,7 +6,8 @@ Changelog
 -----------------
 
 - Improve flow_refs and task_refs validation
-
+- Fix canceling process with REVIVED tasks
+- Fix password reset confirmation template
 
 2.2.8 2024-10-04
 ----------------

viewflow/templates/registration/password_reset_confirm.html

@@ -14,7 +14,7 @@
     <vf-form>
       <form class="vf-form" method="POST" {% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>
         {% csrf_token %}
-        {% form form view.layout %}
+        {% render form view.layout %}
         <div class="vf-page-lockscreen__sidebar-action-row">
           <button class="mdc-button mdc-card__action mdc-card__action--button mdc-button--raised" type="submit">{% trans 'Change my password' %}</button>
         </div>

viewflow/workflow/base.py

@@ -464,7 +464,7 @@ class Flow(Viewset, metaclass=FlowMetaClass):
     def cancel(self, process: Any) -> None:
         with transaction.atomic(), self.lock(process.pk):
             active_tasks = process.task_set.exclude(
-                status__in=[STATUS.DONE, STATUS.CANCELED]
+                status__in=[STATUS.DONE, STATUS.CANCELED, STATUS.REVIVED]
             )
 
             activations = [