modified requests to match the new model.

2 files changed, 7 insertions, 8 deletions

diff --git a/taskapp/models.py b/taskapp/models.py
index e6fb2f5..a4de208 100644
--- a/taskapp/models.py
+++ b/taskapp/models.py
@@ -133,20 +133,19 @@ class Request(models.Model):
     sent_to = models.ManyToManyField(User, related_name = "%(class)s_sent_to", blank = False)
     sent_by = models.ForeignKey(User, related_name = "%(class)s_sent_by", blank = False)
     role = models.CharField(max_length = 2, blank = False)
-    is_active = models.BooleanField(default = True)
     reply = models.BooleanField(default = False)
     is_read = models.BooleanField(default = False)
     creation_date = models.DateTimeField()
     reply_date = models.DateTimeField()
     is_replied = models.BooleanField(default = False)
-    replied_by = models.ForeignKey(User, related_name = "%(class)s_replied_by", blank = False)
+    replied_by = models.ForeignKey(User, related_name = "%(class)s_replied_by", blank = True, null = True)
     task = models.ForeignKey(Task,related_name = "%(class)s_task", blank = True, null = True)
     receiving_user = models.ForeignKey(User, related_name = "%(class)s_receiving_user", blank = True, null = True)
     pynts = models.PositiveIntegerField(default=0)
 
     def __unicode__(self):
 
-        return u"Request %s %s"%(self.by.username, self.role)
+        return u"Request %s %s"%(self.sent_by.username, self.role)
 
 class Notification(models.Model):
 
diff --git a/taskapp/views/user.py b/taskapp/views/user.py
index c0df9b3..a7d39c7 100644
--- a/taskapp/views/user.py
+++ b/taskapp/views/user.py
@@ -99,7 +99,7 @@ def edit_my_profile(request):
 def browse_requests(request):
     
     user = request.user
-    active_reqs = user.request_to.filter(replied=False)
+    active_reqs = user.request_sent_to.filter(is_replied=False)
     reqs = active_reqs.order_by('creation_date').reverse()
     for pos, req in enumerate(reversed(reqs)):
         req.pos = pos
@@ -117,13 +117,13 @@ def view_request(request, rid):
     """
 
     user = request.user
-    reqs = user.request_to.filter(replied=False).order_by('creation_date')
+    reqs = user.request_sent_to.filter(is_replied=False).order_by('creation_date')
     user_request = reqs[int(rid)]
 
     context = {
         'user':user,
         'req':user_request,
-        'sent_users':user_request.to.all()
+        'sent_users':user_request.sent_to.all()
     }
 
     return render_to_response('user/view_request.html', context)
@@ -137,9 +137,9 @@ def process_request(request, rid, reply):
     if request.method=="POST":
         user = request.user
         browse_request_url= '/user/requests'
-        reqs = user.request_to.filter(replied=False).order_by('creation_date')
+        reqs = user.request_sent_to.filter(is_replied=False).order_by('creation_date')
         user_request = reqs[int(rid)]
-
+        
         return show_msg("Your reply has been processed", browse_request_url, "view other requests")
     else:
         return show_msg("You are not authorised to do this", browse_request_url, "view other requests")