Merge pull request #352 from lizaoji/master

Fix slugification of usernames for 0.5 version.

misago/apps/privatethreads/forms.py

@@ -20,7 +20,7 @@ class InviteUsersMixin(object):
         slugs = [self.request.user.username_slug]
         for username in self.cleaned_data['invite_users'].split(','):
             username = username.strip()
-            slug = slugify(username)
+            slug = slugify(username).replace('-', '')
             if len(slug) >= 3 and not slug in slugs:
                 slugs.append(slug)
                 usernames.append(username)
@@ -60,4 +60,4 @@ class EditReplyForm(EditReplyBaseForm):
 
 
 class InviteMemberForm(Form):
-    username = forms.CharField(max_length=200)
+    username = forms.CharField(max_length=200)

misago/apps/privatethreads/jumps.py

@@ -52,7 +52,7 @@ class ShowPostReportView(ShowPostReportBaseView, TypeMixin):
 
 class InviteUserView(JumpView, TypeMixin):
     def make_jump(self):
-        username = slugify(self.request.POST.get('username', '').strip())
+        username = slugify(self.request.POST.get('username', '').strip()).replace('-', '')
         if not username:
             messages.error(self.request, _('You have to enter name of user you want to invite to thread.'), 'threads')
             return self.retreat_redirect()

misago/apps/profiles/views.py

@@ -63,7 +63,7 @@ def list(request, slug=None, page=0):
                 username = username[0:-2]
             elif len(username) > 4:
                 username = username[0:-1]
-            username = slugify(username.strip())
+            username = slugify(username.strip()).replace('-', '')
 
             # Go for rought match
             if len(username) > 0:
@@ -102,4 +102,4 @@ def list(request, slug=None, page=0):
                               'users': users,
                               'pagination': pagination,
                               },
-                              context_instance=RequestContext(request));
+                              context_instance=RequestContext(request));

misago/apps/threadtype/thread/moderation/posts.py

@@ -10,6 +10,7 @@ from misago.messages import Message
 from misago.shortcuts import render_to_response
 from misago.utils.strings import slugify
 from misago.apps.threadtype.thread.moderation.forms import SplitThreadForm, MovePostsForm
+from misago.models import Thread
 
 class PostsModeration(object):
     def post_action_accept(self, ids):

misago/models/threadmodel.py

@@ -193,7 +193,7 @@ class Thread(models.Model):
         self.start_post = start_post
         self.start_poster = start_post.user
         self.start_poster_name = start_post.user_name
-        self.start_poster_slug = slugify(start_post.user_name)
+        self.start_poster_slug = slugify(start_post.user_name).replace('-', '')
         self.start_poster_style = start_post.user.rank.style if start_post.user and start_post.user.rank else ''
         self.upvotes = start_post.upvotes
         self.downvotes = start_post.downvotes
@@ -206,7 +206,7 @@ class Thread(models.Model):
         self.last_post = last_post
         self.last_poster = last_post.user
         self.last_poster_name = last_post.user_name
-        self.last_poster_slug = slugify(last_post.user_name)
+        self.last_poster_slug = slugify(last_post.user_name).replace('-', '')
         self.last_poster_style = last_post.user.rank.style if last_post.user and last_post.user.rank else ''
         # Flags
         self.moderated = start_post.moderated