diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-11-14 16:11:15 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-11-18 11:57:17 +0100 |
| commit | 8b8dac7ba6343107791cdd9062b3037f8c957e73 (patch) | |
| tree | c7b35d492ba8d94d346a715f362ce748e786a39d /chimere/urls.py | |
| parent | 8fd5f6c5ba4e8e40bfa652af79018efcc88556ba (diff) | |
| download | Chimère-8b8dac7ba6343107791cdd9062b3037f8c957e73.tar.bz2 Chimère-8b8dac7ba6343107791cdd9062b3037f8c957e73.zip | |
Fix update share link management
Conflicts:
chimere/templates/chimere/blocks/share_bar.html
Diffstat (limited to 'chimere/urls.py')
| -rw-r--r-- | chimere/urls.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chimere/urls.py b/chimere/urls.py index 74fe238..27c6eef 100644 --- a/chimere/urls.py +++ b/chimere/urls.py @@ -136,7 +136,7 @@ urlpatterns += patterns( url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getCategory/(?P<category_id>\d+)/?$', 'getCategory', name="get_category"), url(r'^(?P<area_name>[a-zA-Z0-9_-]*/)?get-share-url/(?:(?P<network>\w+)/' - r'(?:(?P<attrs>[a-zA-Z0-9_;.:-]+)/)?)?$', + r'(?:(?P<attrs>[a-zA-Z0-9_;.:-]+))?)?/?$', 'getShareUrl', name="get-share-url"), url(r'^(?P<area_name>[a-zA-Z0-9_-]*/)?ty/(?P<tiny_urn>\w+)$', 'redirectFromTinyURN', name="tiny"), |