diff options
| author | nishanth | 2010-03-04 18:30:55 +0530 |
|---|---|---|
| committer | nishanth | 2010-03-04 18:30:55 +0530 |
| commit | f1d2f36818c7033aaff55767a9413d654f68a4c8 (patch) | |
| tree | d2bb7e0752cdd1c3da0cbe33f362199e63ba2cf6 /taskapp | |
| parent | 6e665479f40b383725cf7979aebd79a1388808c1 (diff) | |
| download | pytask-f1d2f36818c7033aaff55767a9413d654f68a4c8.tar.gz pytask-f1d2f36818c7033aaff55767a9413d654f68a4c8.tar.bz2 pytask-f1d2f36818c7033aaff55767a9413d654f68a4c8.zip | |
now claims are read from notifications. we can ditchax claims model now.
Diffstat (limited to 'taskapp')
| -rw-r--r-- | taskapp/models.py | 2 | ||||
| -rw-r--r-- | taskapp/views/task.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/taskapp/models.py b/taskapp/models.py index 2282967..e4607c8 100644 --- a/taskapp/models.py +++ b/taskapp/models.py @@ -163,7 +163,7 @@ class Notification(models.Model): role = models.CharField(max_length = 2, choices = NOTIFY_CHOICES, blank = False) sent_to = models.ForeignKey(User, related_name = "%(class)s_sent_to", blank = False) sent_from = models.ForeignKey(User, related_name = "%(class)s_sent_from", null = True, blank = True) - task = models.ForeignKey(Task, related_name = "%(class)s_sent_for", null = True, blank = True) + task = models.ForeignKey(Task, related_name = "%(class)s_task", null = True, blank = True) sub = models.CharField(max_length = 100) message = models.TextField() diff --git a/taskapp/views/task.py b/taskapp/views/task.py index 5e5cb13..4f8b6c4 100644 --- a/taskapp/views/task.py +++ b/taskapp/views/task.py @@ -342,7 +342,10 @@ def claim_task(request, tid): user = get_user(request.user) if request.user.is_authenticated() else request.user task = getTask(tid) - claims = Claim.objects.filter(task=task) + #claims = Claim.objects.filter(task=task) + #claims = task.notifications_task.filter(role="CL",sent_to=task.created_by) + # this is what the next line should be when i re sync the db + claims = Notification.objects.filter(task=task, sent_to=task.created_by, role="CL") mentors = task.mentors.all() claimed_users = task.claimed_users.all() |