marrub
/
snipt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better blog support for users with dashes or underscores in their usernames.

master
Nick Sergeant 2012-06-07 10:20:48 -04:00
parent f7a913bb53
commit 605d2a237f
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
blogs/middleware.py
View File

@ -1,6 +1,8 @@
from django.shortcuts import get_object_or_404
from django.contrib.auth.models import User
from annoying.functions import get_object_or_None
class BlogMiddleware:
def process_request(self, request):
@ -18,8 +20,15 @@ class BlogMiddleware:
if host_s[1] == 'snipt':
# nick.snipt.net or nick.snipt.localhost
blog_user = ''.join(host_s[:-2]).replace('-', '_')
request.blog_user = get_object_or_404(User, username__iexact=blog_user)
blog_user = ''.join(host_s[:-2])
if '-' in blog_user:
request.blog_user = get_object_or_None(User, username__iexact=blog_user)
if request.blog_user is None:
request.blog_user = get_object_or_404(User, username__iexact=blog_user.replace('-', '_'))
else:
request.blog_user = get_object_or_404(User, username__iexact=blog_user)
else:
# blog.nicksergeant.com