diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-11 11:28:40 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-11 11:28:40 +0200 |
| commit | 9985406e7fd5d7561a79f5e9eeee36d007d66d76 (patch) | |
| tree | 11edfe5030983edca12d2a46d189e72eda5027db /ishtar_common/urls.py | |
| parent | c75b9f076f8893a50713e75cffde1b757c320ebe (diff) | |
| parent | cc12bf5d9c20591d321f4461d2795a58fac07d1c (diff) | |
| download | Ishtar-9985406e7fd5d7561a79f5e9eeee36d007d66d76.tar.bz2 Ishtar-9985406e7fd5d7561a79f5e9eeee36d007d66d76.zip | |
Merge branch 'master' into v0.9
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/' |