pytask: comparison pytask/taskapp/views.py

equal deleted inserted replaced

-:fe51e9080a17
+:0c12181e2c02
 from datetime import datetime
+from django.http import Http404
+from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
-from django.shortcuts import render_to_response, redirect
-from django.http import Http404
-from django.contrib.auth.decorators import login_required
 from django.core.context_processors import csrf
-from django.views.decorators.csrf import csrf_protect
+from django.core.urlresolvers import reverse
+from django.shortcuts import redirect
-from pytask.utils import make_key
+from django.shortcuts import render_to_response
+from pytask.taskapp.forms import ChoiceForm
+from pytask.taskapp.forms import ClaimTaskForm
+from pytask.taskapp.forms import CreateTaskForm
+from pytask.taskapp.forms import CreateTextbookForm
+from pytask.taskapp.forms import EditTaskForm
+from pytask.taskapp.forms import EditTextbookForm
+from pytask.taskapp.forms import TaskCommentForm
+from pytask.taskapp.forms import WorkReportForm
+from pytask.taskapp.models import Task
+from pytask.taskapp.models import TaskComment
+from pytask.taskapp.models import TaskClaim
+from pytask.taskapp.models import TextBook
+from pytask.taskapp.models import WorkReport
+from pytask.taskapp.utils import getTask
+from pytask.taskapp.utils import getTextBook
 from pytask.views import show_msg
-from pytask.taskapp.models import Task, TaskComment, TaskClaim, TextBook, \
-WorkReport
-from pytask.taskapp.forms import CreateTaskForm, EditTaskForm, \
-TaskCommentForm, ClaimTaskForm, \
-ChoiceForm, EditTaskForm, CreateTextbookForm,\
-EditTextbookForm, WorkReportForm
-from pytask.taskapp.utils import getTask, getTextBook
-from pytask.profile.utils import get_notification
 @login_required
 def create_task(request):
 data = form.cleaned_data.copy()
 data.update({"created_by": user,
 "creation_datetime": datetime.now(),
 "uniq_key": make_key(Task),
 })
 task = Task(**data)
 task.save()
-task_url = '/task/view/tid=%s'%task.uniq_key
+task_url = reverse('view_task', kwargs={'task_id': task.id})
 return redirect(task_url)
 else:
 context.update({'form':form})
 return render_to_response('task/create.html', context)
 else:
 })
 return render_to_response("task/browse.html", context)
-def view_task(request, tid):
+def view_task(request, task_id):
-""" get the task depending on its tid and display accordingly if it is a get.
+""" get the task depending on its task_id and display accordingly if it is a get.
 check for authentication and add a comment if it is a post request.
 """
-task_url = "/task/view/tid=%s"%tid
+task_url = reverse('view_task', kwargs={'task_id': task_id})
-task = getTask(tid)
+task = getTask(task_id)
 user = request.user
 if not user.is_authenticated():
 return render_to_response("task/view.html", {"task": task})
 }
 context.update(csrf(request))
 if task.status == "DL":
-return show_msg(user, 'This task no longer exists', '/task/browse/','browse the tasks')
+return show_msg(user, 'This task no longer exists',
+reverse('browse_tasks'), 'browse the tasks')
 task_viewable = True if ( task.status != "UP" ) or profile.rights != "CT"\
 else False
 if not task_viewable:
-return show_msg(user, "You are not authorised to view this task", "/task/browse/", "browse the tasks")
+return show_msg(user, "You are not authorised to view this task",
+reverse('browse_tasks'), "browse the tasks")
 reviewers = task.reviewers.all()
 is_reviewer = True if user in task.reviewers.all() else False
-comments = task.comments.filter(is_deleted=False).order_by('comment_datetime')
+comments = task.comments.filter(
+is_deleted=False).order_by('comment_datetime')
 context.update({'is_reviewer':is_reviewer,
 'comments':comments,
 'reviewers':reviewers,
 })
 profile.rights!="CT" else False
 context['can_mod_reviewers'] = True if profile.rights in ["MG", "DC"] else\
 False
-#    if task.status == "CD":
-#        context['closing_notification'] =  Notification.objects.filter(task=task,role="CD")[0]
-#    elif task.status == "CM":
-#        context['completed_notification'] =  Notifications.objects.filter(task=task,role="CM")[0]
-#    elif task.status == "WR":
-#        context['assigned_users'] = task.assigned_users.all()
 if request.method == 'POST':
 form = TaskCommentForm(request.POST)
 if form.is_valid():
 data = form.cleaned_data['data']
 new_comment = TaskComment(task=task, data=data,
 form = TaskCommentForm()
 context['form'] = form
 return render_to_response('task/view.html', context)
 @login_required
-def edit_task(request, tid):
+def edit_task(request, task_id):
 """ only creator gets to edit the task and that too only before it gets
 approved.
 """
 user = request.user
 profile = user.get_profile()
-task_url = "/task/view/tid=%s"%tid
+task_url = reverse('view_task', kwargs={'task_id': task_id})
-task = getTask(tid)
+task = getTask(task_id)
 is_creator = True if user == task.created_by else False
 can_edit = True if task.status == "UP" and is_creator else False
 if not can_edit:
 raise Http404
 form = EditTaskForm(instance=task)
 context.update({"form": form})
 return render_to_response("task/edit.html", context)
 @login_required
-def approve_task(request, tid):
+def approve_task(request, task_id):
 user = request.user
 profile = user.get_profile()
-task_url = "/task/view/tid=%s"%tid
+task = getTask(task_id)
-task = getTask(tid)
 if profile.rights not in ["MG", "DC"] or task.status != "UP":
 raise Http404
 context = {"user": user,
 }
 return render_to_response("task/confirm_approval.html", context)
 @login_required
-def approved_task(request, tid):
+def approved_task(request, task_id):
 user = request.user
 profile = user.get_profile()
-task_url = "/task/view/tid=%s"%tid
+task = getTask(task_id)
-task = getTask(tid)
 if profile.rights not in ["MG", "DC"] or task.status != "UP":
 raise Http404
 task.approved_by = user
 }
 return render_to_response("task/approved_task.html", context)
 @login_required
-def addreviewer(request, tid):
+def addreviewer(request, task_id):
 user = request.user
 profile = user.get_profile()
-task_url = "/task/view/tid=%s"%tid
+task_url = reverse('view_task', kwargs={'task_id': task_id})
-task = getTask(tid)
+task = getTask(task_id)
 can_mod_reviewers = True if profile.rights in ["MG", "DC"] else False
 if not can_mod_reviewers:
 raise Http404
 context.update(csrf(request))
 # This part has to be made better
 reviewer_choices = User.objects.filter(is_active=True).\
-exclude(reviewing_tasks__uniq_key=tid).\
+exclude(reviewing_tasks__uniq_key=task_id).\
-exclude(claimed_tasks__uniq_key=tid).\
+exclude(claimed_tasks__uniq_key=task_id).\
-exclude(selected_tasks__uniq_key=tid).\
+exclude(selected_tasks__uniq_key=task_id).\
-exclude(created_tasks__uniq_key=tid)
+exclude(created_tasks__uniq_key=task_id)
 choices = ((a_user.id,a_user.username) for a_user in reviewer_choices)
 label = "Reviewer"
 if request.method == "POST":
 else:
 form = ChoiceForm(choices, label=label)
 context.update({"form": form})
 return render_to_response("task/addreviewer.html", context)
-def view_work(request, tid):
+def view_work(request, task_id):
-task_url = "/task/view/tid=%s"%tid
+task = getTask(task_id)
-task = getTask(tid)
 user = request.user
 old_reports = task.reports.all()
 context = {"task": task,
 context.update({"is_working": is_working})
 return render_to_response("task/view_work.html", context)
 @login_required
-def view_report(request, rid):
+def view_report(request, report_id):
 try:
-report = WorkReport.objects.get(uniq_key=rid)
+report = WorkReport.objects.get(uniq_key=report_id)
 except WorkReport.DoesNotExist:
 raise Http404
 user = request.user
 context = {"report": report,
 context.update({"profile": profile})
 return render_to_response("task/view_report.html", context)
 @login_required
-def submit_report(request, tid):
+def submit_report(request, task_id):
 """ Check if the work is in WR state and the user is in assigned_users.
 """
+task_url = reverse('view_task', kwargs={'task_id': task_id})
-user = request.user
+task = getTask(task_id)
-task = getTask(tid)
+user = request.user
 old_reports = task.reports.all()
 if not task.status == "WR":
 raise Http404
 "submitted_at": datetime.now(),
 })
 r = WorkReport(**data)
 r.save()
-report_url = "/task/view/report/rid=%s"%r.uniq_key
+report_url = reverse('view_report', kwargs={'report_id': r.id})
 return redirect(report_url)
 else:
 context.update({"form":form})
 return render_to_response('task/submit_report.html', context)
 new_textbook = TextBook(**data)
 new_textbook.save()
 new_textbook.chapters = form.cleaned_data['chapters']
-textbook_url = "/task/textbook/view/tid=%s"%new_textbook.uniq_key
+textbook_url = reverse(
+'view_textbook', kwargs={'task_id': new_textbook.id})
 return redirect(textbook_url)
 else:
 context.update({"form": form})
 return render_to_response("task/create_textbook.html", context)
 else:
 form = CreateTextbookForm()
 context.update({"form": form})
 return render_to_response("task/create_textbook.html", context)
-def view_textbook(request, tid):
+def view_textbook(request, task_id):
-textbook = getTextBook(tid)
+textbook = getTextBook(task_id)
-textbook_url = "/task/textbook/view/tid=%s"%textbook.uniq_key
 chapters = textbook.chapters.all()
 user = request.user
 context = {"user": user,
 context.update({"unpub_textbooks": unpub_textbooks})
 return render_to_response("task/browse_textbooks.html", context)
 @login_required
-def edit_textbook(request, tid):
+def edit_textbook(request, task_id):
 user = request.user
 profile = user.get_profile()
-textbook = getTextBook(tid)
+textbook = getTextBook(task_id)
-textbook_url = "/task/textbook/view/tid=%s"%textbook.uniq_key
+textbook_url = reverse(
+'view_textbook', kwargs={'task_id': textbook.id})
 can_edit = True if user == textbook.created_by and textbook.status == "UP"\
 else False
 if not can_edit:
 form = EditTextbookForm(instance=textbook)
 context.update({"form": form})
 return render_to_response("task/edit_textbook.html", context)
 @login_required
-def claim_task(request, tid):
+def claim_task(request, task_id):
-task_url = "/task/view/tid=%s"%tid
+claim_url = "/task/claim/task_id=%s"%task_id
-claim_url = "/task/claim/tid=%s"%tid
+task = getTask(task_id)
-task = getTask(tid)
 if task.status == "UP":
 raise Http404
 user = request.user
 context.update(csrf(request))
 reviewers = task.reviewers.all()
 claimed_users = task.claimed_users.all()
-selected_users = task.selected_users.all()
 is_creator = True if user == task.created_by else False
 is_reviewer = True if user in reviewers else False
 has_claimed = True if user in claimed_users else False
 form = ClaimTaskForm()
 context.update({"form": form})
 return render_to_response("task/claim.html", context)
 @login_required
-def select_user(request, tid):
+def select_user(request, task_id):
 """ first get the status of the task and then select one of claimed users
 generate list of claimed users by passing it as an argument to a function.
 """
-task_url = "/task/view/tid=%s"%tid
+task_url = reverse('view_task', kwargs={'task_id': task_id})
 user = request.user
 profile = user.get_profile()
-task = getTask(tid)
+task = getTask(task_id)
 context = {"user": user,
 "profile": profile,
 "task": task,
 }
 context.update(csrf(request))
 claimed_users = task.claimed_users.all()
-selected_users = task.selected_users.all()
 task_claimed = True if claimed_users else False
 is_creator = True if user == task.created_by else False
 if ( is_creator or profile.rights in ["CR", "DC"] ) and \
 task_url, 'view the task')
 else:
 raise Http404
 @login_required
-def approve_textbook(request, tid):
+def approve_textbook(request, task_id):
 user = request.user
 profile = user.get_profile()
-textbook_url = "/task/view/tid=%s"%tid
+textbook = getTextBook(task_id)
-textbook = getTextBook(tid)
 if profile.rights not in ["MG", "DC"] or textbook.status != "UP":
 raise Http404
 context = {"user": user,
 }
 return render_to_response("task/confirm_textbook_approval.html", context)
 @login_required
-def approved_textbook(request, tid):
+def approved_textbook(request, task_id):
 user = request.user
 profile = user.get_profile()
-textbook_url = "/task/view/tid=%s"%tid
+textbook = getTextBook(task_id)
-textbook = getTextBook(tid)
 if profile.rights not in ["MG", "DC"] or textbook.status != "UP":
 raise Http404
 textbook.approved_by = user

changeset 408	0c12181e2c02
parent 387	32dd15eaf9d0
child 422	4bb891fc7a54