diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-21 23:53:23 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-21 23:53:23 +0100 |
| commit | 9eacb3f2b2f5819ef3eea1a54bb2c4bfb13efda6 (patch) | |
| tree | 2a2b687acef6f878c05f7148a150c10c3a7fb71a /archaeological_finds/urls.py | |
| parent | 8eb09a666e7048ce8e531649566418670d94036d (diff) | |
| parent | c00bb6298a602f74c55cfd60b8601295470a8e3b (diff) | |
| download | Ishtar-9eacb3f2b2f5819ef3eea1a54bb2c4bfb13efda6.tar.bz2 Ishtar-9eacb3f2b2f5819ef3eea1a54bb2c4bfb13efda6.zip | |
Merge branch 'master' into v0.9
Conflicts:
Makefile.example
archaeological_operations/migrations/0061_regenerate_cached_label.py
archaeological_warehouse/migrations/0024_generate_cache_lbl_for_containers.py
Diffstat (limited to 'archaeological_finds/urls.py')
| -rw-r--r-- | archaeological_finds/urls.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py index 4a8dec030..06d505896 100644 --- a/archaeological_finds/urls.py +++ b/archaeological_finds/urls.py @@ -267,6 +267,8 @@ urlpatterns += patterns( name=models.FindSource.SHOW_URL), url(r'^show-find/basket-(?P<pk>.+)/(?P<type>.+)?$', 'show_findbasket', name='show-findbasket'), + url(r'^display-find/basket-(?P<pk>.+)/$', 'display_findbasket', + name='display-findbasket'), url(r'^show-find(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_find', name=models.Find.SHOW_URL), url(r'^display-find/(?P<pk>.+)/$', 'display_find', @@ -282,6 +284,10 @@ urlpatterns += patterns( kwargs={'full': 'shortcut'}), url(r'^show-treatment(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_treatment', name=models.Treatment.SHOW_URL), + url(r'show-historized-treatment/(?P<pk>.+)?/(?P<date>.+)?$', + 'show_treatment', name='show-historized-treatment'), + url(r'^revert-treatment/(?P<pk>.+)/(?P<date>.+)$', + 'revert_treatment', name='revert-treatment'), url(r'get-treatmentfile/(?P<type>.+)?$', 'get_treatmentfile', name='get-treatmentfile'), url(r'get-treatmentfile-shortcut/(?P<type>.+)?$', @@ -290,6 +296,10 @@ urlpatterns += patterns( url(r'^show-treatmentfile(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_treatmentfile', name=models.TreatmentFile.SHOW_URL), + url(r'show-historized-treatmentfile/(?P<pk>.+)?/(?P<date>.+)?$', + 'show_treatmentfile', name='show-historized-treatmentfile'), + url(r'^revert-treatmentfile/(?P<pk>.+)/(?P<date>.+)$', + 'revert_treatmentfile', name='revert-treatmentfile'), # url(r'show-treatmentfile(?:/(?P<pk>.+))?/(?P<type>.+)?$', # 'show_treatmentfile', # name=models.TreatmentFile.SHOW_URL), |