diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2016-01-10 15:35:51 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2016-01-10 15:35:51 +0100 |
| commit | 9de20f503852855b5dda8723693c5d156232d16d (patch) | |
| tree | 8d8e7c09faf179b2fed07878d1cf450a245a78d0 /archaeological_context_records/urls.py | |
| parent | 5e0b683ccc3851a4092e4d459a43fb557299d47e (diff) | |
| parent | 23622f70dc4b6b544dcd99994e46ea20ff309777 (diff) | |
| download | Ishtar-9de20f503852855b5dda8723693c5d156232d16d.tar.bz2 Ishtar-9de20f503852855b5dda8723693c5d156232d16d.zip | |
Merge branch 'master' into master-land-planner-2999
Diffstat (limited to 'archaeological_context_records/urls.py')
| -rw-r--r-- | archaeological_context_records/urls.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/archaeological_context_records/urls.py b/archaeological_context_records/urls.py index 6ffc2f194..da6d80a98 100644 --- a/archaeological_context_records/urls.py +++ b/archaeological_context_records/urls.py @@ -19,6 +19,7 @@ from django.conf.urls.defaults import * +from archaeological_context_records import models from ishtar_common.wizards import check_rights import views @@ -59,7 +60,7 @@ urlpatterns = patterns( urlpatterns += patterns( 'archaeological_context_records.views', url(r'show-contextrecord(?:/(?P<pk>.+))?/(?P<type>.+)?$', - 'show_contextrecord', name='show-contextrecord'), + 'show_contextrecord', name=models.ContextRecord.SHOW_URL), url(r'show-historized-contextrecord/(?P<pk>.+)?/(?P<date>.+)?$', 'show_contextrecord', name='show-historized-contextrecord'), url(r'revert-contextrecord/(?P<pk>.+)/(?P<date>.+)$', @@ -80,6 +81,8 @@ urlpatterns += patterns( url(r'get-contextrecord-full/(?P<type>.+)?$', 'get_contextrecord', name='get-contextrecord-full', kwargs={'full': True}), + url(r'show-contextrecordsource(?:/(?P<pk>.+))?/(?P<type>.+)?$', + 'show_contextrecordsource', name=models.ContextRecordSource.SHOW_URL), url(r'get-contexrecordsource/(?P<type>.+)?$', 'get_contextrecordsource', name='get-contextrecordsource'), ) |
