diff options
author | Madhusudan.C.S | 2011-02-04 16:37:22 +0530 |
---|---|---|
committer | Madhusudan.C.S | 2011-02-04 16:37:22 +0530 |
commit | ce7ffa68515e7fe39e310c4f22f2f2cf42cc5602 (patch) | |
tree | 2ccd067c78a2047f3a06e4d05ae5eb2e1d4cc08d | |
parent | eb44369a59221ef98565612070abaa1d23a2d960 (diff) | |
download | pytask-ce7ffa68515e7fe39e310c4f22f2f2cf42cc5602.tar.gz pytask-ce7ffa68515e7fe39e310c4f22f2f2cf42cc5602.tar.bz2 pytask-ce7ffa68515e7fe39e310c4f22f2f2cf42cc5602.zip |
Style fixes.
-rwxr-xr-x | pytask/taskapp/views/task.py | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/pytask/taskapp/views/task.py b/pytask/taskapp/views/task.py index 930e6bf..bb50ff8 100755 --- a/pytask/taskapp/views/task.py +++ b/pytask/taskapp/views/task.py @@ -362,7 +362,7 @@ def approved_task(request, task_id): "task/approved_task.html", RequestContext(request, context)) @login_required -def addreviewer(request, task_id): +def addreviewer(request, task_id, template_name='task/addreviewer.html'): user = request.user profile = user.get_profile() @@ -370,30 +370,36 @@ def addreviewer(request, task_id): task_url = reverse('view_task', kwargs={'task_id': task_id}) task = shortcuts.get_object_or_404(taskapp_models.Task, pk=task_id) - can_mod_reviewers = True if profile.role in [profile_models.ROLES_CHOICES[0][0], profile_models.ROLES_CHOICES[1][0]] else False + if profile.role in [profile_models.ROLES_CHOICES[0][0], + profile_models.ROLES_CHOICES[1][0]]: + can_mod_reviewers = True + else: + can_mod_reviewers = False + if not can_mod_reviewers: raise http.Http404 - context = {"user": user, - "profile": profile, - "task": task, - } + context = { + 'user': user, + 'profile': profile, + 'task': task, + } context.update(csrf(request)) - # This part has to be made better - reviewer_choices = User.objects.filter(is_active=True).\ - exclude(reviewing_tasks__id=task_id).\ - exclude(claimed_tasks__id=task_id).\ - exclude(selected_tasks__id=task_id).\ - exclude(created_tasks__id=task_id) + # TODO(Madhu): This part has to be made better + reviewer_choices = User.objects.filter( + is_active=True).exclude(reviewing_tasks__id=task_id).exclude( + claimed_tasks__id=task_id).exclude( + selected_tasks__id=task_id).exclude(created_tasks__id=task_id) - choices = ((a_user.id,a_user.username) for a_user in reviewer_choices) + choices = ((a_user.id, a_user.username) for a_user in reviewer_choices) label = "Reviewer" if request.method == "POST": - form = taskapp_forms.ChoiceForm(choices, data=request.POST, label=label) + form = taskapp_forms.ChoiceForm( + choices, data=request.POST, label=label) if form.is_valid(): data = form.cleaned_data.copy() uid = data['choice'] @@ -404,12 +410,12 @@ def addreviewer(request, task_id): else: context.update({"form": form}) return shortcuts.render_to_response( - "task/addreviewer.html", RequestContext(request, context)) + template_name, RequestContext(request, context)) else: form = taskapp_forms.ChoiceForm(choices, label=label) context.update({"form": form}) return shortcuts.render_to_response( - "task/addreviewer.html", RequestContext(request, context)) + template_name, RequestContext(request, context)) def view_work(request, task_id): |