From 6749f688b64ba9a7ccd88213a23d36403c3eae9e Mon Sep 17 00:00:00 2001 From: Nick Smith Date: Wed, 2 Jul 2014 14:20:30 +0100 Subject: [PATCH] PEP-8 --- wagtail/wagtailusers/forms.py | 2 +- wagtail/wagtailusers/models.py | 18 +++++++++--------- wagtail/wagtailusers/views/groups.py | 4 ++-- wagtail/wagtailusers/views/users.py | 1 + 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/wagtail/wagtailusers/forms.py b/wagtail/wagtailusers/forms.py index efb0ca016..81b352606 100644 --- a/wagtail/wagtailusers/forms.py +++ b/wagtail/wagtailusers/forms.py @@ -38,7 +38,7 @@ class UserCreationForm(BaseUserCreationForm): username = self.cleaned_data["username"] try: # When called from BaseUserCreationForm, the method fails if using a AUTH_MODEL_MODEL, - # This is because the following line tries to perform a lookup on + # This is because the following line tries to perform a lookup on # the default "auth_user" table. User._default_manager.get(username=username) except User.DoesNotExist: diff --git a/wagtail/wagtailusers/models.py b/wagtail/wagtailusers/models.py index eb0aa0c9e..5e63e6af3 100644 --- a/wagtail/wagtailusers/models.py +++ b/wagtail/wagtailusers/models.py @@ -9,19 +9,19 @@ class UserProfile(models.Model): user = models.OneToOneField(settings.AUTH_USER_MODEL) submitted_notifications = models.BooleanField( - default=True, - help_text=_("Receive notification when a page is submitted for moderation") - ) + default=True, + help_text=_("Receive notification when a page is submitted for moderation") + ) approved_notifications = models.BooleanField( - default=True, - help_text=_("Receive notification when your page edit is approved") - ) + default=True, + help_text=_("Receive notification when your page edit is approved") + ) rejected_notifications = models.BooleanField( - default=True, - help_text=_("Receive notification when your page edit is rejected") - ) + default=True, + help_text=_("Receive notification when your page edit is rejected") + ) @classmethod def get_for_user(cls, user): diff --git a/wagtail/wagtailusers/views/groups.py b/wagtail/wagtailusers/views/groups.py index 15994f39e..07692adcf 100644 --- a/wagtail/wagtailusers/views/groups.py +++ b/wagtail/wagtailusers/views/groups.py @@ -4,7 +4,6 @@ from django.contrib.auth.models import Group from django.contrib.auth.decorators import permission_required from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from django.contrib import messages -from django.db.models import Q from django.utils.translation import ugettext as _ from django.views.decorators.vary import vary_on_headers @@ -47,7 +46,7 @@ def index(request): if ordering in ['name', 'username']: if ordering != 'name': - users = users.order_by(ordering) + groups = groups.order_by(ordering) else: ordering = 'name' @@ -76,6 +75,7 @@ def index(request): 'query_string': q, }) + @permission_required(change_user_perm) def create(request): if request.POST: diff --git a/wagtail/wagtailusers/views/users.py b/wagtail/wagtailusers/views/users.py index 5c89862e7..427106789 100644 --- a/wagtail/wagtailusers/views/users.py +++ b/wagtail/wagtailusers/views/users.py @@ -75,6 +75,7 @@ def index(request): 'query_string': q, }) + @permission_required(change_user_perm) def create(request): if request.POST: