Merge pull request #79 from bazerk/master

Django allows @ for usernames, so the render_primary url pattern should also
This commit is contained in:
Grant McConnaughey 2015-04-24 19:18:23 -05:00
commit 3e312bba4e

View file

@ -8,7 +8,7 @@ urlpatterns = patterns('avatar.views',
url(r'^add/$', 'add', name='avatar_add'),
url(r'^change/$', 'change', name='avatar_change'),
url(r'^delete/$', 'delete', name='avatar_delete'),
url(r'^render_primary/(?P<user>[\w\d\.\-_]{3,30})/(?P<size>[\d]+)/$', 'render_primary', name='avatar_render_primary'),
url(r'^render_primary/(?P<user>[\w\d\@\.\-_]{3,30})/(?P<size>[\d]+)/$', 'render_primary', name='avatar_render_primary'),
url(r'^list/(?P<username>[\+\w\@\.]+)/$', 'avatar_gallery', name='avatar_gallery'),
url(r'^list/(?P<username>[\+\w\@\.]+)/(?P<id>[\d]+)/$', 'avatar', name='avatar'),
)