Fixed build

misago/users/forms/admin.py

@@ -189,7 +189,7 @@ class SearchUsersFormBase(forms.Form):
         criteria = search_criteria
         if criteria.get('username'):
             queryset = queryset.filter(
-                username_slug__startswith=criteria.get('username').lower())
+                slug__startswith=criteria.get('username').lower())
 
         if criteria.get('email'):
             queryset = queryset.filter(

misago/users/management/commands/cacheblankavatar.py → misago/users/management/commands/updateblankavatar.py

@@ -2,7 +2,7 @@ from PIL import Image
 
 from django.core.management.base import BaseCommand
 
-from misago.users.avatars import cache
+from misago.users.avatars import store
 from misago.users.avatars.paths import BLANK_AVATAR
 
 
@@ -18,8 +18,8 @@ class FakeUser(object):
 
 
 class Command(BaseCommand):
-    help = 'Overwrites cached blank avatar with new one.'
+    help = 'Updates stored blank avatar.'
 
     def handle(self, *args, **options):
-        cache.store_new_avatar(FakeUser, Image.open(BLANK_AVATAR))
-        self.stdout.write('Blank avatar cache was refreshed.')
+        store.store_new_avatar(FakeUser, Image.open(BLANK_AVATAR))
+        self.stdout.write('Blank avatar was updated.')

misago/users/tests/test_namechanges.py

@@ -16,7 +16,7 @@ class UsernameChangesTests(TestCase):
         self.assertEqual(test_user.namechanges.count(), 0)
 
         test_user.set_username('Boberson')
-        test_user.save(update_fields=['username', 'username_slug'])
+        test_user.save(update_fields=['username', 'slug'])
 
         namechanges = UsernameChanges(test_user)
         self.assertEqual(namechanges.left, 1)

misago/users/tests/test_profile_views.py

@@ -5,7 +5,7 @@ from misago.admin.testutils import AdminTestCase
 
 class UserProfileViewsTests(AdminTestCase):
     def setUp(self):
-        super(ChangeForumOptionsTests, self).setUp()
+        super(UserProfileViewsTests, self).setUp()
         self.link_kwargs = {
             'user_slug': self.test_admin.slug,
             'user_id': self.test_admin.pk
@@ -13,16 +13,16 @@ class UserProfileViewsTests(AdminTestCase):
 
     def test_user_posts_list(self):
         """user profile posts list has no showstoppers"""
-        response = self.client.get(reverse('misago:user_posts'),
-                                   kwargs=self.link_kwargs)
+        response = self.client.get(reverse('misago:user_posts',
+                                           kwargs=self.link_kwargs))
 
         self.assertEqual(response.status_code, 200)
         self.assertIn('posted no messages', response.content)
 
     def test_user_threads_list(self):
         """user profile threads list has no showstoppers"""
-        response = self.client.get(reverse('misago:user_threads'),
-                                   kwargs=self.link_kwargs)
+        response = self.client.get(reverse('misago:user_threads',
+                                           kwargs=self.link_kwargs))
 
         self.assertEqual(response.status_code, 200)
         self.assertIn('started no threads', response.content)

misago/users/tests/test_user_model.py

@@ -12,7 +12,7 @@ class UserManagerTests(TestCase):
         db_user = User.objects.get(id=user.pk)
 
         self.assertEqual(user.username, db_user.username)
-        self.assertEqual(user.username_slug, db_user.username_slug)
+        self.assertEqual(user.slug, db_user.slug)
         self.assertEqual(user.email, db_user.email)
         self.assertEqual(user.email_hash, db_user.email_hash)
 
@@ -57,7 +57,7 @@ class UserModelTests(TestCase):
 
         user.set_username('Boberson')
         self.assertEqual(user.username, 'Boberson')
-        self.assertEqual(user.username_slug, 'boberson')
+        self.assertEqual(user.slug, 'boberson')
 
         self.assertEqual(user.get_username(), 'Boberson')
         self.assertEqual(user.get_full_name(), 'Boberson')

misago/users/views/admin/users.py

@@ -38,8 +38,8 @@ class UsersList(UserAdmin, generic.ListView):
     ordering = (
         ('-id', _("From newest")),
         ('id', _("From oldest")),
-        ('username_slug', _("A to z")),
-        ('-username_slug', _("Z to a")),
+        ('slug', _("A to z")),
+        ('-slug', _("Z to a")),
         ('posts', _("Biggest posters")),
         ('-posts', _("Smallest posters")),
     )
@@ -105,7 +105,7 @@ class UsersList(UserAdmin, generic.ListView):
             messages.success(request, message)
 
     def action_ban(self, request, users):
-        users = users.order_by('username_slug')
+        users = users.order_by('slug')
         for user in users:
             if user.is_superuser:
                 message = _("%(username)s is super admin and can't be banned.")

misago/users/views/usercp.py

@@ -252,7 +252,7 @@ def change_username(request):
         form = ChangeUsernameForm(request.POST, user=request.user)
         if form.is_valid():
             request.user.set_username(form.cleaned_data['new_username'])
-            request.user.save(update_fields=['username', 'username_slug'])
+            request.user.save(update_fields=['username', 'slug'])
 
             message = _("Your username has been changed.")
             messages.success(request, message)