Add TaskHandler code to actually make previous commit work.

[plomtask] / templates / todo.html

diff --git a/templates/todo.html b/templates/todo.html
index 5ffa354e172a83aec7bd016cff07a4917c954200..de5dbd27c9a0b9ca6299cdb48ea283464129c077 100644 (file)
--- a/templates/todo.html
+++ b/templates/todo.html
@@ -22,20 +22,21 @@ select{ font-size: 0.5em; margin: 0; padding: 0; }
 <a href="todo?id={{item.todo.id_}}">{{item.todo.title_then|e}}</a>
 {% else %}
 {{item.process.title.newest|e}}
-{% if indent == 0 %}
-· fill: <select name="fill_for_{{item.id_}}">
+{% if parent_todo %}
+· fill: <select name="step_filler_to_{{parent_todo.id_}}">
 <option value="ignore">--</option>
-<option value="make_{{item.process.id_}}">make</option>
+<option value="make_{{item.process.id_}}">make empty</option>
 {% for adoptable in adoption_candidates_for[item.process.id_] %}
 <option value="{{adoptable.id_}}">adopt #{{adoptable.id_}}{% if adoptable.comment %} / {{adoptable.comment}}{% endif %}</option>
 {% endfor %}
 </select>
 {% endif %}
+
 {% endif %}
 </td>
 </tr>
 {% for child in item.children %}
-{{ draw_tree_row(child, item, indent+1) }}
+{{ draw_tree_row(child, item.todo, indent+1) }}
 {% endfor %}
 {% endmacro %}
 
@@ -56,8 +57,8 @@ select{ font-size: 0.5em; margin: 0; padding: 0; }
 </tr>
 <tr>
 <th>done</th>
-<td><input type="checkbox" name="done" {% if todo.is_done %}checked {% endif %} {% if not todo.is_doable %}disabled {% endif %}/>
-{% if not todo.is_doable and todo.is_done %}<input type="hidden" name="done" value="1" />{% endif %}
+<td><input type="checkbox" name="is_done" {% if todo.is_done %}checked {% endif %} {% if not todo.is_doable %}disabled {% endif %}/>
+{% if not todo.is_doable and todo.is_done %}<input type="hidden" name="is_done" value="1" />{% endif %}
 </td>
 </tr>
 <tr>
@@ -74,11 +75,11 @@ select{ font-size: 0.5em; margin: 0; padding: 0; }
 </tr>
 <tr>
 <th>conditions</th>
-<td>{{ macros.simple_checkbox_table("condition", todo.conditions, "condition", "condition_candidates") }}</td>
+<td>{{ macros.simple_checkbox_table("conditions", todo.conditions, "condition", "condition_candidates") }}</td>
 </tr>
 <tr>
 <th>blockers</th>
-<td>{{ macros.simple_checkbox_table("blocker", todo.blockers, "condition", "condition_candidates") }}</td>
+<td>{{ macros.simple_checkbox_table("blockers", todo.blockers, "condition", "condition_candidates") }}</td>
 </tr>
 <tr>
 <th>enables</th>
@@ -107,7 +108,8 @@ select{ font-size: 0.5em; margin: 0; padding: 0; }
 </table>
 {% endif %}
 adopt: <input type="text" name="adopt" list="todo_candidates" autocomplete="off" /><br />
-make: <input type="text" name="make" list="process_candidates" autocomplete="off" />
+make empty: <input type="text" name="make_empty" list="process_candidates" autocomplete="off" /><br />
+make full: <input type="text" name="make_full" list="process_candidates" autocomplete="off" />
 </td>
 </tr>
 </table>