diff options
Diffstat (limited to 'taskapp')
| -rw-r--r-- | taskapp/models.py | 2 | ||||
| -rw-r--r-- | taskapp/models.pyc | bin | 4637 -> 0 bytes | |||
| -rw-r--r-- | taskapp/views/task.py | 8 |
3 files changed, 8 insertions, 2 deletions
diff --git a/taskapp/models.py b/taskapp/models.py index 986f65d..9d7f1ce 100644 --- a/taskapp/models.py +++ b/taskapp/models.py @@ -46,7 +46,7 @@ class Profile(models.Model): class Task(models.Model): - title = models.CharField(max_length = 200, unique = True) + title = models.CharField(max_length = 100, unique = True) desc = models.TextField() status = models.CharField(max_length = 2, choices = STATUS_CHOICES, default = "UP") tags = models.CharField(max_length = 200, blank = True) diff --git a/taskapp/models.pyc b/taskapp/models.pyc Binary files differdeleted file mode 100644 index ee07db6..0000000 --- a/taskapp/models.pyc +++ /dev/null diff --git a/taskapp/views/task.py b/taskapp/views/task.py index 0fbc6aa..c266f22 100644 --- a/taskapp/views/task.py +++ b/taskapp/views/task.py @@ -189,12 +189,14 @@ def claim_task(request, tid): task_claimable = True if task.status in ["OP", "RE", "CL"] else False user_can_claim = True if task_claimable and not ( is_guest or is_mentor ) and ( user not in task.claimed_users.all() ) else False + task_claimed = True if task.status == "CL" else False context = {'is_mentor':is_mentor, 'task':task, 'claims':claims, 'user_can_claim':user_can_claim, 'task_claimable':task_claimable, + 'task_claimed':task_claimed, 'errors':errors} if not is_guest: @@ -239,8 +241,12 @@ def assign_task(request, tid): return redirect(task_url) else: return render_to_response('task/assign.html',{'form':form}) - else: + elif task.status == "AS": return show_msg('The task is already assigned', task_url, 'view the task') + elif task.status == "OP": + return show_msg('No one has still claimed the task', task_url, 'view the task') + else: + return show_msg('The task status is %s. how can you assign it now'%task.status, task_url, 'view the task') else: return show_msg('You are not authorised to perform this action', task_url, 'view the task') |