From 1e25ccd51424b1129b36acf7a6488cb2d272c8af Mon Sep 17 00:00:00 2001
From: J08nY
Date: Tue, 4 Jul 2017 17:54:47 +0200
Subject: Save the complete workflow stack, not only last step.

---
 src/mailman/app/workflow.py | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

(limited to 'src/mailman/app/workflow.py')

diff --git a/src/mailman/app/workflow.py b/src/mailman/app/workflow.py
index 92b78c184..e705668f8 100644
--- a/src/mailman/app/workflow.py
+++ b/src/mailman/app/workflow.py
@@ -56,7 +56,7 @@ class Workflow:
         self._next.append(step)
 
     def _pop(self):
-        name = self._next.popleft()
+        name = self._next.pop()
         step = getattr(self, '_step_{}'.format(name))
         self._count += 1
         if self.debug:                              # pragma: nocover
@@ -119,20 +119,12 @@ class Workflow:
         assert self.token, 'Workflow token must be set'
         state_manager = getUtility(IWorkflowStateManager)
         data = {attr: getattr(self, attr) for attr in self.SAVE_ATTRIBUTES}
-        # Note: only the next step is saved, not the whole stack.  This is not
-        # an issue in practice, since there's never more than a single step in
-        # the queue anyway.  If we want to support more than a single step in
-        # the queue *and* want to support state saving/restoring, change this
-        # method and the restore() method.
+        # Save the workflow stack.
         if len(self._next) == 0:
-            step = None
-        elif len(self._next) == 1:
-            step = self._next[0]
+            steps = '[]'
         else:
-            raise AssertionError(
-                "Can't save a workflow state with more than one step "
-                "in the queue")
-        state_manager.save(self.token, step, json.dumps(data))
+            steps = json.dumps(list(self._next))
+        state_manager.save(self.token, steps, json.dumps(data))
 
     def restore(self):
         state_manager = getUtility(IWorkflowStateManager)
@@ -141,8 +133,8 @@ class Workflow:
             # The token doesn't exist in the database.
             raise LookupError(self.token)
         self._next.clear()
-        if state.step:
-            self._next.append(state.step)
+        if state.steps:
+            self._next.extend(json.loads(state.steps))
         data = json.loads(state.data)
         for attr in self.SAVE_ATTRIBUTES:
             try:
-- 
cgit v1.2.3-70-g09d2