summaryrefslogtreecommitdiff
path: root/taskapp/views
diff options
context:
space:
mode:
authornishanth2010-02-28 22:49:05 +0530
committernishanth2010-02-28 22:49:05 +0530
commit2e78ea670355735b7a717dcfd87f1690cacf6ef6 (patch)
tree95456e7d23f862a2748dc5bb130bcaaa8733aa22 /taskapp/views
parent32a2753b002516357f6504a76d28851f0cc94829 (diff)
downloadpytask-2e78ea670355735b7a717dcfd87f1690cacf6ef6.tar.gz
pytask-2e78ea670355735b7a717dcfd87f1690cacf6ef6.tar.bz2
pytask-2e78ea670355735b7a717dcfd87f1690cacf6ef6.zip
ditchaxed credit model.
Diffstat (limited to 'taskapp/views')
-rw-r--r--taskapp/views/task.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/taskapp/views/task.py b/taskapp/views/task.py
index d90e7cd..fb05bd5 100644
--- a/taskapp/views/task.py
+++ b/taskapp/views/task.py
@@ -3,7 +3,7 @@ from datetime import datetime
from django.http import HttpResponse, Http404
from django.shortcuts import render_to_response, redirect
-from pytask.taskapp.models import User, Task, Comment, Claim, Credit, Request
+from pytask.taskapp.models import User, Task, Comment, Claim, Request
from pytask.taskapp.utilities.task import getTask
from pytask.taskapp.forms.task import TaskCreateForm, AddMentorForm, AddTaskForm, ChoiceForm, AssignCreditForm, RemoveUserForm
from pytask.taskapp.events.task import createTask, reqMentor, publishTask, addSubTask, addDep, addClaim, assignTask, updateTask, removeTask, removeUser, assignCredits, completeTask, closeTask
@@ -492,9 +492,7 @@ def edit_task(request, tid):
task = Task.objects.get(id=tid)
user = get_user(request.user) if request.user.is_authenticated() else request.user
-
def complete_task(request, tid):
-
""" call the event called complete task.
and also pass it the current user to know who marked it as complete.
"""
@@ -562,7 +560,7 @@ def close_task(request, tid):
context["error"] = "Please enter a reason for closing the task"
return render_to_response('task/close.html', context)
else:
- closeTask(task, user)
+ closeTask(task, user, data['reason'])
return show_msg(user, "The task has been closed.", task_url, "view the task.")
else:
return render_to_response('task/close.html', context)