- move intranet-ganttproject/www/delete-task.tcl to

  intranet-timesheet2-tasks/www/task-delete.tcl next to task-action.tcl
- implemented task deletion in task tree

tcl/intranet-timesheet2-tasks-procs.tcl

@@ -498,11 +498,13 @@ ad_proc -public im_timesheet_task_list_tree_component {
       ORDER BY
         subtree.tree_sortkey
     "
+    
 
     template::list::create \
 	-name tree \
 	-key task_id \
 	-pass_properties { return_url project_id } \
+	-bulk_action_export_vars { return_url project_id action } \
 	-elements {
 	    task_nr {
 		label "Task NR"
@@ -521,9 +523,8 @@ ad_proc -public im_timesheet_task_list_tree_component {
 	    }
 	} \
 	-bulk_actions {
-	    "Delete" "/intranet-timesheet2-tasks/delete-dependency" "Delete selected task dependency"
-	} \
-	-bulk_action_method post
+	    "Delete" "/intranet-timesheet2-tasks/task-delete" "Delete selected task"
+	} 
 
     return [template::list::render -name tree]
 }

www/task-delete.tcl

+ad_page_contract {
+
+} {
+    { task_id:optional,multiple "" }
+    project_id
+    return_url
+}
+
+#
+# Using "/intranet-timesheet2-tasks/task-action"
+# 
+
+# /task-action expects the task_id as an array
+set tmp $task_id
+unset task_id
+array set task_id {}
+foreach i $tmp {
+    set task_id($i) $i
+}
+
+set vars [export_vars -url {task_id:array project_id return_url}]
+
+ad_returnredirect "/intranet-timesheet2-tasks/task-action?action=delete&$vars"
+
+