diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-16 12:47:33 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-16 12:48:23 +0100 |
| commit | 8ed231cd95ff9d279a81df3bb6541e6113412964 (patch) | |
| tree | e6d085c1f8521ee7feb9ddd980dc5e0ad5bce7a5 /archaeological_finds | |
| parent | bbaad22b70fbe644958e0d69cc360f5a1d0bf4f2 (diff) | |
| download | Ishtar-8ed231cd95ff9d279a81df3bb6541e6113412964.tar.bz2 Ishtar-8ed231cd95ff9d279a81df3bb6541e6113412964.zip | |
Basket: add a close button (refs #3407)
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 2 | ||||
| -rw-r--r-- | archaeological_finds/urls.py | 2 | ||||
| -rw-r--r-- | archaeological_finds/views.py | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 381c81a31..912bf1b93 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -142,7 +142,7 @@ </a> </td> <td class='string'>{{ treatment.year }} - {{treatment.index}}</td> - <td class='string'>{{ treatment.label }}</td> + <td class='string'>{{ treatment.label|default_if_none:"-" }}</td> <td class='string'>{{ treatment.treatment_types_lbl }}</td> <td class='string'>{{ treatment.treatment_state|default_if_none:"-" }}</td> <td class='item-list'>{% for item in items %}<span>{{item}} {{ item|link_to_window}}</span>{% endfor %}</td> diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py index 4a8dec030..9c554a124 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', diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 084f15d13..341734ae7 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -108,10 +108,12 @@ show_findsource = show_item(models.FindSource, 'findsource') get_findsource = get_item(models.FindSource, 'get_findsource', 'findsource') show_find = show_item(models.Find, 'find') -display_find = display_item(models.Find, 'find') +display_find = display_item(models.Find) revert_find = revert_item(models.Find) show_findbasket = show_item(models.FindBasket, 'findbasket') +display_findbasket = display_item(models.FindBasket, + show_url='show-find/basket-') find_creation_steps = [ ('selecrecord-find_creation', RecordFormSelectionTable), |