Use the attachment field in the WorkReport for Task than adding a new field for comments.

Also add support for dynamic path to upload depending on the task and task parent
ids for directory names by passing a function that builds the path for the given
task.

2 files changed, 6 insertions, 2 deletions

diff --git a/pytask/taskapp/forms.py b/pytask/taskapp/forms.py
index f9fe9ed..82ad7fb 100644
--- a/pytask/taskapp/forms.py
+++ b/pytask/taskapp/forms.py
@@ -114,7 +114,7 @@ class TaskCommentForm(forms.ModelForm):
 
     class Meta:
         model = TaskComment
-        fields = ['data', 'file']
+        fields = ['data']
 
     def clean_data(self):
 
diff --git a/pytask/taskapp/models.py b/pytask/taskapp/models.py
index a650b60..3d290e7 100755
--- a/pytask/taskapp/models.py
+++ b/pytask/taskapp/models.py
@@ -156,7 +156,11 @@ class WorkReport(models.Model):
     summary = models.CharField(max_length=1024, verbose_name="Summary",
                                help_text="A one line summary")
 
-    attachment = models.FileField(upload_to=UPLOADS_DIR)
+    attachment = models.FileField(
+      verbose_name='Your work to upload',
+      upload_to=lambda inst, fn: \
+          os.path.join(settings.UPLOAD_BASE_DIR, str(inst.task.parent.id),
+                       str(inst.task.id), fn))
 
     revision = models.PositiveIntegerField(default=0)