From 50b7c5027ce0d81aae32bb5e55d5990be53c157d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Thu, 14 Aug 2014 00:56:07 -0700 Subject: [PATCH] PermissionDenied -> ret HttpResponseFordbidden() --- issue/middleware.py | 4 ++-- issue/views.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/issue/middleware.py b/issue/middleware.py index 0b33743..b5a0c78 100644 --- a/issue/middleware.py +++ b/issue/middleware.py @@ -1,4 +1,4 @@ -from django.core.exceptions import ImproperlyConfigured, PermissionDenied +from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ObjectDoesNotExist from django.http import HttpResponseForbidden from django.contrib.auth.decorators import login_required @@ -56,7 +56,7 @@ class ProjectMiddleware: project = projects.get(name=project) except ObjectDoesNotExist: if request.user.is_authenticated(): - raise PermissionDenied() + return HttpResponseForbidden() else: return login_required(view)(request, *view_args, **view_kwargs) view_kwargs['project'] = project diff --git a/issue/views.py b/issue/views.py index d8872b4..2d481ff 100644 --- a/issue/views.py +++ b/issue/views.py @@ -1,6 +1,6 @@ from django.shortcuts import render, redirect, get_object_or_404 from django.contrib import messages -from django.core.exceptions import ObjectDoesNotExist, PermissionDenied +from django.core.exceptions import ObjectDoesNotExist from django.contrib.auth.decorators import login_required from django.http import Http404, HttpResponseForbidden @@ -352,13 +352,13 @@ def issue_edit(request, project, issue=None): if issue: if not request.user.has_perm('modify_issue', project): - raise PermissionDenied + return HttpResponseForbidden() issue = get_object_or_404(Issue, project=project.name, id=issue) init_data = {'title': issue.title, 'description': issue.description} else: if not request.user.has_perm('create_issue', project): - raise PermissionDenied + return HttpResponseForbidden() issue = None init_data = None