summaryrefslogtreecommitdiff
path: root/taskapp
diff options
context:
space:
mode:
authoranoop2010-02-24 15:41:37 +0530
committeranoop2010-02-24 15:41:37 +0530
commit4ee56fb25760237577fb10df8f64843a76075a71 (patch)
tree9ee7a3398123250fdd80069d25bf5adb3e6cf065 /taskapp
parente5d2242006b9ebba504785f37049d8e07bb4c580 (diff)
downloadpytask-4ee56fb25760237577fb10df8f64843a76075a71.tar.gz
pytask-4ee56fb25760237577fb10df8f64843a76075a71.tar.bz2
pytask-4ee56fb25760237577fb10df8f64843a76075a71.zip
made change to the request model and corresponding create_request utility.
Diffstat (limited to 'taskapp')
-rw-r--r--taskapp/models.py1
-rw-r--r--taskapp/utilities/request.py8
2 files changed, 8 insertions, 1 deletions
diff --git a/taskapp/models.py b/taskapp/models.py
index 62458ac..77a5a76 100644
--- a/taskapp/models.py
+++ b/taskapp/models.py
@@ -140,6 +140,7 @@ class Request(models.Model):
reply_date = models.DateTimeField()
replied = models.BooleanField(default = False)
task = models.ForeignKey(Task,related_name = "%(class)s_task", blank = True, null = True)
+ assigned_user = models.ForeignKey(User, related_name = "%(class)s_assigned_user", blank = True, null = True)
class Notification(models.Model):
diff --git a/taskapp/utilities/request.py b/taskapp/utilities/request.py
index af66319..41370f8 100644
--- a/taskapp/utilities/request.py
+++ b/taskapp/utilities/request.py
@@ -1,12 +1,14 @@
from pytask.taskapp.models import Request
from datetime import datetime
-def create_request(to,by,role):
+def create_request(to,by,role,task=None,assigned_user=None):
"""
creates an unreplied request, based on the passed arguments
to - a list of users to which the notification is to be sent
by - sender of request
role - a two character field which represents the role requested
+ task - a requesting task (useful for sending admins a request to give Pynts to the user, assigning a user to a task)
+ assigned_user - user to whom the Pynts/Task is assigned to(useful for sending admins a request to give Pynts to the user, assigning a user to a task)
"""
req = Request(creation_date=datetime.now())
req.by = by
@@ -14,4 +16,8 @@ def create_request(to,by,role):
req.save()
req.to = to
req.role = role
+ if task not None:
+ req.task = task
+ if assigned_user not None:
+ req.assigned_user = assigned_user
req.save()