diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-11 11:43:14 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-11 11:43:14 +0200 |
| commit | 9ebf429a92a8fa0dd04df6cdd51caa2ef1c58c39 (patch) | |
| tree | 3bbb30e8d51acc9d52083be6b21c2bdcfd2f5fdc /ishtar_common/urls.py | |
| parent | 73afc7f761b29a1404cdf567e1880816abcb96aa (diff) | |
| parent | 08f1fe99d11e40ca506469c1d782791fca18d49d (diff) | |
| download | Ishtar-9ebf429a92a8fa0dd04df6cdd51caa2ef1c58c39.tar.bz2 Ishtar-9ebf429a92a8fa0dd04df6cdd51caa2ef1c58c39.zip | |
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'ishtar_common/urls.py')
| -rw-r--r-- | ishtar_common/urls.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py index a6f24beed..049bcaf7b 100644 --- a/ishtar_common/urls.py +++ b/ishtar_common/urls.py @@ -34,6 +34,7 @@ urlpatterns = patterns( # internationalization url(r'^i18n/', include('django.conf.urls.i18n')), # General + url(r'shortcut_menu/', views.shortcut_menu, name='shortcut-menu'), url(r'person_search/(?P<step>.+)?$', check_rights(['add_person'])( views.person_search_wizard), name='person_search'), @@ -129,6 +130,9 @@ urlpatterns += patterns( name='dashboard-main-detail'), url(r'update-current-item/$', 'update_current_item', name='update-current-item'), + url(r'pin/(?P<item_type>[a-z-]+)/(?P<pk>\d+)/$', 'update_current_item', + name='pin'), + url(r'unpin/(?P<item_type>[a-z-]+)/$', 'unpin', name='unpin'), url(r'new-person/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$', 'new_person', name='new-person'), url(r'new-person-noorga/' |