From 5fef8a44f7d9ef257950010f72d1082ee7251e98 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Sat, 17 Sep 2011 09:52:52 +0100 Subject: [PATCH] Fix sort order and blacklisting error messages --- app/hr/views.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/hr/views.py b/app/hr/views.py index b1b5a94..d5b4288 100644 --- a/app/hr/views.py +++ b/app/hr/views.py @@ -163,7 +163,7 @@ class HrAdminApplications(ListView): if query and len(query) < 3: apps = apps[:50] - return apps + return apps.order_by(order) class HrUpdateApplication(BaseDetailView): @@ -358,15 +358,14 @@ class HrBlacklistUser(FormView): for account in self.blacklist_user.redditaccount_set.all(): self.blacklist_item(BLACKLIST_TYPE_REDDIT, account.username) - messages.add_message(request, messages.INFO, "User %s has been blacklisted" % u.username ) + messages.add_message(self.request, messages.INFO, "User %s has been blacklisted" % u.username ) # Disable the account if requested if form.cleaned_data.get('disable', None): self.blacklist_user.active = False self.blacklist_user.save() + messages.add_message(self.request, messages.INFO, "User %s disabled" % u.username) update_user_access.delay(user=self.blacklist_user.id) - messages.add_message(request, messages.INFO, "User %s disabled" % u.username ) - return redirect('sso.views.user_view', username=self.blacklist_user.username)