Permalink
Browse files

Bugfix: Username URL's didn't accept dots.

  • Loading branch information...
1 parent 29af9ff commit 34780766117d4edcb1c3374b09546cde0732b710 @wunki wunki committed Apr 6, 2011
Showing with 13 additions and 13 deletions.
  1. +1 −1 .venv
  2. +12 −12 userena/urls.py
View
2 .venv
@@ -1 +1 @@
-django-userena.org
+django-userena
View
@@ -39,59 +39,59 @@
{'template_name': 'userena/password_reset_complete.html'}),
# Signup
- url(r'^(?P<username>\w+)/signup/complete/$',
+ url(r'^(?P<username>[\.\w]+)/signup/complete/$',
userena_views.direct_to_user_template,
{'template_name': 'userena/signup_complete.html',
'extra_context': {'userena_activation_days': userena_settings.USERENA_ACTIVATION_DAYS}},
name='userena_signup_complete'),
# Activate
- url(r'^(?P<username>\w+)/activate/complete/$',
+ url(r'^(?P<username>[\.\w]+)/activate/complete/$',
userena_views.direct_to_user_template,
{'template_name': 'userena/activate_complete.html'},
name='userena_activate_complete'),
- url(r'^(?P<username>\w+)/activate/(?P<activation_key>\w+)/$',
+ url(r'^(?P<username>[\.\w]+)/activate/(?P<activation_key>\w+)/$',
userena_views.activate,
name='userena_activate'),
# Change email and confirm it
- url(r'^(?P<username>\w+)/email/$',
+ url(r'^(?P<username>[\.\w]+)/email/$',
userena_views.email_change,
name='userena_email_change'),
- url(r'^(?P<username>\w+)/email/complete/$',
+ url(r'^(?P<username>[\.\w]+)/email/complete/$',
userena_views.direct_to_user_template,
{'template_name': 'userena/email_change_complete.html'},
name='userena_email_change_complete'),
- url(r'^(?P<username>\w+)/confirm-email/complete/$',
+ url(r'^(?P<username>[\.\w]+)/confirm-email/complete/$',
userena_views.direct_to_user_template,
{'template_name': 'userena/email_confirm_complete.html'},
name='userena_email_confirm_complete'),
- url(r'^(?P<username>\w+)/confirm-email/(?P<confirmation_key>\w+)/$',
+ url(r'^(?P<username>[\.\w]+)/confirm-email/(?P<confirmation_key>\w+)/$',
userena_views.email_confirm,
name='userena_email_confirm'),
# Disabled account
- url(r'^(?P<username>\w+)/disabled/$',
+ url(r'^(?P<username>[\.\w]+)/disabled/$',
userena_views.direct_to_user_template,
{'template_name': 'userena/disabled.html'},
name='userena_disabled'),
# Change password
- url(r'^(?P<username>\w+)/password/$',
+ url(r'^(?P<username>[\.\w]+)/password/$',
userena_views.password_change,
name='userena_password_change'),
- url(r'^(?P<username>\w+)/password/complete/$',
+ url(r'^(?P<username>[\.\w]+)/password/complete/$',
userena_views.direct_to_user_template,
{'template_name': 'userena/password_complete.html'},
name='userena_password_change_complete'),
# Edit profile
- url(r'^(?P<username>\w+)/edit/$',
+ url(r'^(?P<username>[\.\w]+)/edit/$',
userena_views.profile_edit,
name='userena_profile_edit'),
# View profiles
- url(r'^(?P<username>\w+)/$',
+ url(r'^(?P<username>[\.\w]+)/$',
userena_views.profile_detail,
name='userena_profile_detail'),
url(r'^page/(?P<page>[0-9]+)/$',

0 comments on commit 3478076

Please sign in to comment.