diff options
| -rw-r--r-- | pytask/taskapp/forms.py | 2 | ||||
| -rwxr-xr-x | pytask/taskapp/models.py | 1 | ||||
| -rwxr-xr-x | pytask/taskapp/views/task.py | 4 | ||||
| -rw-r--r-- | pytask/templates/task/view.html | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/pytask/taskapp/forms.py b/pytask/taskapp/forms.py index 82ad7fb..f9fe9ed 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'] + fields = ['data', 'file'] def clean_data(self): diff --git a/pytask/taskapp/models.py b/pytask/taskapp/models.py index c9ec8be..fcb2443 100755 --- a/pytask/taskapp/models.py +++ b/pytask/taskapp/models.py @@ -106,6 +106,7 @@ class TaskComment(models.Model): task = models.ForeignKey('Task', related_name="comments") data = models.TextField(verbose_name='Comment') + file = models.FileField(verbose_name='Upload Your file', upload_to="pytask-uploads", null=True) commented_by = models.ForeignKey(User, related_name="commented_taskcomments") diff --git a/pytask/taskapp/views/task.py b/pytask/taskapp/views/task.py index 2345070..9381dfb 100755 --- a/pytask/taskapp/views/task.py +++ b/pytask/taskapp/views/task.py @@ -274,12 +274,12 @@ def view_task(request, task_id, **kwargs): context['can_mod_reviewers'] = False if request.method == 'POST': - form = taskapp_forms.TaskCommentForm(request.POST) + form = taskapp_forms.TaskCommentForm(request.POST, request.FILES) if form.is_valid(): data = form.cleaned_data['data'] new_comment = taskapp_forms.TaskComment( task=task, data=data, commented_by=user, - comment_datetime=datetime.now()) + comment_datetime=datetime.now(), file=request.FILES['file']) new_comment.save() return shortcuts.redirect(task_url) else: diff --git a/pytask/templates/task/view.html b/pytask/templates/task/view.html index b98cad1..6aef7fd 100644 --- a/pytask/templates/task/view.html +++ b/pytask/templates/task/view.html @@ -112,7 +112,7 @@ along with PyTask. If not, see <http://www.gnu.org/licenses/>. {% if can_comment %} Add comment:<br /> - {% as_div_form form "Comment Form" csrf_token "Submit" %} + {% as_div_form form "Comment Form" csrf_token "Submit" "" "True" %} {% endif %} {% endblock %} |