diff options
| author | nishanth | 2010-02-26 11:29:25 +0530 |
|---|---|---|
| committer | nishanth | 2010-02-26 11:29:25 +0530 |
| commit | 971556bc6ed19d417bfd1959e31fba0c20b907b2 (patch) | |
| tree | 1041181b23694ca2c413d03cc7f6e4293ef352b5 /taskapp | |
| parent | 8dff30125e4a169b28cdc8242041e4e92b5b0718 (diff) | |
| download | pytask-971556bc6ed19d417bfd1959e31fba0c20b907b2.tar.gz pytask-971556bc6ed19d417bfd1959e31fba0c20b907b2.tar.bz2 pytask-971556bc6ed19d417bfd1959e31fba0c20b907b2.zip | |
now task page displays only undeleted comments. and publish task removes previous comments.
Diffstat (limited to 'taskapp')
| -rw-r--r-- | taskapp/events/task.py | 4 | ||||
| -rw-r--r-- | taskapp/models.py | 2 | ||||
| -rw-r--r-- | taskapp/views/task.py | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/taskapp/events/task.py b/taskapp/events/task.py index 86f8a47..9ed1450 100644 --- a/taskapp/events/task.py +++ b/taskapp/events/task.py @@ -17,6 +17,10 @@ def publishTask(task): task.mentors.clear() task.mentors.add(task.created_by) + + task.comment_set.update(is_deleted=True) + task.comment_set.update(deleted_by=task.created_by) + task.save() return task diff --git a/taskapp/models.py b/taskapp/models.py index 8e0a88a..4df3d6c 100644 --- a/taskapp/models.py +++ b/taskapp/models.py @@ -107,7 +107,7 @@ class Comment(models.Model): created_by = models.ForeignKey(User, related_name = "%(class)s_created_by") creation_datetime = models.DateTimeField() deleted_by = models.ForeignKey(User, null = True, blank = True, related_name = "%(class)s_deleted_by") - deleted = models.BooleanField() + is_deleted = models.BooleanField() attachment = models.FileField(upload_to = UPLOADS_DIR, blank = True) def __unicode__(self): diff --git a/taskapp/views/task.py b/taskapp/views/task.py index 443d84e..443596a 100644 --- a/taskapp/views/task.py +++ b/taskapp/views/task.py @@ -61,7 +61,7 @@ def view_task(request, tid): if task.status == "DL": return show_msg(user, 'This task no longer exists', '/task/browse/','browse the tasks') - comments = Comment.objects.filter(task=task) + comments = task.comment_set.filter(is_deleted=False) mentors = task.mentors.all() deps, subs = task.deps, task.subs |