diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
| commit | c0f14049777002bf0849f04dabc99a6bc66de295 (patch) | |
| tree | 777c2f1bcfc1cde0056a64b04d0ee322948ade56 /archaeological_context_records/urls.py | |
| parent | 229a5559e9933ea76020963ca3778906d39279d4 (diff) | |
| parent | 1191cb323ca087ea05d5f58acb555b8e2d266801 (diff) | |
| download | Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.tar.bz2 Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.zip | |
Merge branch 'master' into v0.9
Conflicts:
archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py
Diffstat (limited to 'archaeological_context_records/urls.py')
| -rw-r--r-- | archaeological_context_records/urls.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/archaeological_context_records/urls.py b/archaeological_context_records/urls.py index 24e8e06eb..341d321f9 100644 --- a/archaeological_context_records/urls.py +++ b/archaeological_context_records/urls.py @@ -69,6 +69,9 @@ urlpatterns += patterns( name='autocomplete-contextrecord'), url(r'show-contextrecord(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_contextrecord', name=models.ContextRecord.SHOW_URL), + # show-contextrecordrelation is only a view the id point to a context record + url(r'show-contextrecord(?:/(?P<pk>.+))?/(?P<type>.+)?$', + 'show_contextrecord', name='show-contextrecordrelation'), url(r'show-historized-contextrecord/(?P<pk>.+)?/(?P<date>.+)?$', 'show_contextrecord', name='show-historized-contextrecord'), url(r'revert-contextrecord/(?P<pk>.+)/(?P<date>.+)$', @@ -94,6 +97,9 @@ urlpatterns += patterns( kwargs={'full': 'shortcut'}), url(r'get-contextrecordrelation/(?P<type>.+)?$', 'get_contextrecordrelation', name='get-contextrecordrelation'), + url(r'get-contextrecordrelationdetail/(?P<type>.+)?$', + 'get_contextrecordrelationdetail', + name='get-contextrecordrelationdetail'), url(r'show-contextrecordsource(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_contextrecordsource', name=models.ContextRecordSource.SHOW_URL), url(r'get-contexrecordsource/(?P<type>.+)?$', |