summaryrefslogtreecommitdiff
path: root/taskapp/views
diff options
context:
space:
mode:
authornishanth2010-02-28 02:45:21 +0530
committernishanth2010-02-28 02:45:21 +0530
commitaf7842ffd0effddd2d2438f4ac30eeb5d682bf38 (patch)
tree1e3ccf0a76ae143429339107edef6033f5d35163 /taskapp/views
parentf3c50c41aea97c289dfbe3176191592754277544 (diff)
downloadpytask-af7842ffd0effddd2d2438f4ac30eeb5d682bf38.tar.gz
pytask-af7842ffd0effddd2d2438f4ac30eeb5d682bf38.tar.bz2
pytask-af7842ffd0effddd2d2438f4ac30eeb5d682bf38.zip
now view credits page shows all the credits.. including the pending and rejected ones.
Diffstat (limited to 'taskapp/views')
-rw-r--r--taskapp/views/task.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/taskapp/views/task.py b/taskapp/views/task.py
index 02a6bc1..26aca14 100644
--- a/taskapp/views/task.py
+++ b/taskapp/views/task.py
@@ -435,12 +435,14 @@ def assign_credits(request, tid):
choices.extend([(_.id, _.username) for _ in task.assigned_users.all() ])
prev_credits = task.credit_set.all()
## here we can ditchax credits model and use the request model
+ credit_requests = task.request_task.filter(role="PY",is_valid=True).order_by('creation_date').reverse()
form = AssignCreditForm(choices)
context = {
'user':user,
'task':task,
'prev_credits':prev_credits,
+ 'credit_requests':credit_requests,
'form':form,
}