From 2fd7ae792795b60df3f66fa2cab4a9565b491fc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Tue, 4 Oct 2016 15:21:59 +0200
Subject: [PATCH] Some task creation fixes

---
 src/scripts/tutti/10_tasks.js                | 11 ++++++++---
 src/templates/attract/shots/for_project.jade |  2 +-
 src/templates/attract/tasks/for_project.jade |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/scripts/tutti/10_tasks.js b/src/scripts/tutti/10_tasks.js
index 4a34366..a0b509d 100644
--- a/src/scripts/tutti/10_tasks.js
+++ b/src/scripts/tutti/10_tasks.js
@@ -158,24 +158,29 @@ function task_add(shot_id, task_id, task_type)
 
 /**
  * Create a task and show it in the #item-details div.
+ *
+ * 'shot_id' may be undefined, in which case the task will not
+ * be attached to a shot.
  */
 function task_create(shot_id, task_type)
 {
-    if (shot_id === undefined || task_type === undefined) {
+    if (task_type === undefined) {
         throw new ReferenceError("task_create(" + shot_id + ", " + task_type + ") called.");
     }
 
     var project_url = ProjectUtils.projectUrl();
     var url = '/attract/' + project_url + '/tasks/create';
+    var has_shot_id = typeof shot_id !== 'undefined';
 
     data = {
         task_type: task_type,
-        parent: shot_id,
     };
+    if (has_shot_id) data.parent = shot_id;
+
 
     $.post(url, data, function(task_data) {
         task_open(task_data.task_id);
-        task_add(shot_id, task_data.task_id, task_type);
+        if (has_shot_id) task_add(shot_id, task_data.task_id, task_type);
     })
     .fail(function(xhr) {
         if (console) {
diff --git a/src/templates/attract/shots/for_project.jade b/src/templates/attract/shots/for_project.jade
index 5e37ba2..ee80465 100644
--- a/src/templates/attract/shots/for_project.jade
+++ b/src/templates/attract/shots/for_project.jade
@@ -56,7 +56,7 @@
 					a.task-add(
 						title="Add a new '{{ task_type }}' task",
 						class="task-add-link {% if tasks_for_shots[shot._id][task_type] %}hidden{% endif %}"
-						href="javascript:task_create('{{ shot._id }}', '{{ project.url }}', '{{ task_type }}');")
+						href="javascript:task_create('{{ shot._id }}', '{{ task_type }}');")
 						| + Task
 				| {% endfor %}
 			| {% endfor %}
diff --git a/src/templates/attract/tasks/for_project.jade b/src/templates/attract/tasks/for_project.jade
index 7ae629b..e2b00e6 100644
--- a/src/templates/attract/tasks/for_project.jade
+++ b/src/templates/attract/tasks/for_project.jade
@@ -7,7 +7,7 @@
 		a(href="") Tasks ({{ tasks | count }})
 		a.task-project(href="{{url_for('projects.view', project_url=project.url)}}") {{ project.name }}
 
-		a#task-add(href="javascript:task_create(undefined, '{{ project.url }}', 'None');") + Create Task
+		a#task-add(href="javascript:task_create(undefined, 'generic');") + Create Task
 
 	#task-list.col-list
 		| {% for task in tasks %}