diff -r 52958289d81f -r 7cad1e92713d taskapp/events/task.py --- a/taskapp/events/task.py Mon Mar 01 02:09:00 2010 +0530 +++ b/taskapp/events/task.py Mon Mar 01 04:44:49 2010 +0530 @@ -27,8 +27,11 @@ task.comment_set.update(deleted_by=task.created_by) task.published_datetime = datetime.now() + task.save() - task.save() + pending_requests = task.request_task.filter(is_valid=True, is_replied=False) + pending_requests.update(is_valid=False) + return task def addSubTask(main_task, sub_task): @@ -233,12 +236,12 @@ ## generate notifications here for a_user in task.assigned_users.all(): - create_notification(role="CD", sent_to=a_user, sent_from=marked_by, task=task) + create_notification(role="CD", sent_to=a_user, sent_from=closed_by, task=task, remarks=reason) for a_user in task.claimed_users.all(): - create_notification(role="CD", sent_to=a_user, sent_from=marked_by, task=task) + create_notification(role="CD", sent_to=a_user, sent_from=closed_by, task=task, remarks=reason) for a_mentor in task.mentors.all(): - create_notification(role="CD", sent_to=a_mentor, sent_from=marked_by, task=task) + create_notification(role="CD", sent_to=a_mentor, sent_from=closed_by, task=task, remarks=reason)