Fix some ProcessStepping bugs.

[plomtask] / plomtask / http.py

diff --git a/plomtask/http.py b/plomtask/http.py
index 537f21fff50f5dea2a75daf66edc368107ab0902..fd206032bd302de252c05747e3457199c03770fb 100644 (file)
--- a/plomtask/http.py
+++ b/plomtask/http.py
@@ -175,9 +175,9 @@ class TaskHandler(BaseHTTPRequestHandler):
             todos.sort(key=lambda t: t.is_done)
         elif sort_by == '-doneness':
             todos.sort(key=lambda t: t.is_done, reverse=True)
-        elif sort_by == 'process':
+        elif sort_by == 'title':
             todos.sort(key=lambda t: t.title_then)
-        elif sort_by == '-process':
+        elif sort_by == '-title':
             todos.sort(key=lambda t: t.title_then, reverse=True)
         elif sort_by == 'comment':
             todos.sort(key=lambda t: t.comment)
@@ -379,9 +379,6 @@ class TaskHandler(BaseHTTPRequestHandler):
             if step_id not in self.form_data.get_all_int('steps'):
                 raise BadFormatException('trying to keep unknown step')
         for step_id in self.form_data.get_all_int('steps'):
-            for step_process_id in self.form_data.get_all_int(
-                    f'new_step_to_{step_id}'):
-                steps += [(None, step_process_id, step_id)]
             if step_id not in self.form_data.get_all_int('keep_step'):
                 continue
             step_process_id = self.form_data.get_int(
@@ -389,8 +386,13 @@ class TaskHandler(BaseHTTPRequestHandler):
             parent_id = self.form_data.get_int_or_none(
                     f'step_{step_id}_parent_id')
             steps += [(step_id, step_process_id, parent_id)]
+        for step_id in self.form_data.get_all_int('steps'):
+            for step_process_id in self.form_data.get_all_int(
+                    f'new_step_to_{step_id}'):
+                steps += [(None, step_process_id, step_id)]
         for step_process_id in self.form_data.get_all_int('new_top_step'):
             steps += [(None, step_process_id, None)]
+        process.uncache()
         process.set_steps(self.conn, steps)
         process.save(self.conn)
         return f'/process?id={process.id_}'