diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-03 15:39:32 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-03 15:39:32 +0200 |
| commit | 712b4f41ae86bc0ff8baa3c54d568a4e88bab502 (patch) | |
| tree | c3a1dfb7ae02dc5604f8cab964c5fc9f2f74d74c | |
| parent | 90c55d9abcf9438176bb6fce767c6a9ffb35ed13 (diff) | |
| parent | fcef9b103e59114ee488cf684836524797cf4981 (diff) | |
| download | Ishtar-712b4f41ae86bc0ff8baa3c54d568a4e88bab502.tar.bz2 Ishtar-712b4f41ae86bc0ff8baa3c54d568a4e88bab502.zip | |
Merge branch 'stable'
| -rw-r--r-- | ishtar_common/urls.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py index 13c19096e..ac3e0c248 100644 --- a/ishtar_common/urls.py +++ b/ishtar_common/urls.py @@ -66,14 +66,14 @@ urlpatterns = patterns('', name='organization_person_edit'), url(r'account_management/(?P<step>.+)?$', views.account_management_wizard, name='account_management'), - url(r'import/$', views.NewImportView.as_view(), name='new_import'), - url(r'import-list/$', views.ImportListView.as_view(), + url(r'^import/$', views.NewImportView.as_view(), name='new_import'), + url(r'^import-list/$', views.ImportListView.as_view(), name='current_imports'), - url(r'import-list-old/$', views.ImportOldListView.as_view(), + url(r'^import-list-old/$', views.ImportOldListView.as_view(), name='old_imports'), - url(r'import-delete/(?P<pk>[0-9]+)/$', + url(r'^import-delete/(?P<pk>[0-9]+)/$', views.ImportDeleteView.as_view(), name='import_delete'), - url(r'import-link-unmatched/(?P<pk>[0-9]+)/$', + url(r'^import-link-unmatched/(?P<pk>[0-9]+)/$', views.ImportLinkView.as_view(), name='import_link_unmatched'), ) for section in menu.childs: |