diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/templatetags/window_tables.py | 9 | ||||
| -rw-r--r-- | ishtar_common/views.py | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ishtar_common/templatetags/window_tables.py b/ishtar_common/templatetags/window_tables.py index 03365c207..578d94535 100644 --- a/ishtar_common/templatetags/window_tables.py +++ b/ishtar_common/templatetags/window_tables.py @@ -16,7 +16,8 @@ from archaeological_files.models import File from archaeological_operations.models import OperationSource, Operation from archaeological_context_records.models import ContextRecord, \ ContextRecordSource -from archaeological_finds.models import Find, FindSource, FindTreatments +from archaeological_finds.models import Find, FindSource, \ + FindUpstreamTreatments, FindDownstreamTreatments register = template.Library() @@ -43,8 +44,10 @@ ASSOCIATED_MODELS['finds_for_ope'] = ( Find, 'get-find-for-ope', 'get-find-full') ASSOCIATED_MODELS['finds_docs'] = ( FindSource, 'get-findsource', 'get-findsource-full') -ASSOCIATED_MODELS['finds_treatments'] = ( - FindTreatments, 'get-treatment', 'get-treatment-full') +ASSOCIATED_MODELS['finds_upstreamtreatments'] = ( + FindUpstreamTreatments, 'get-upstreamtreatment', '') +ASSOCIATED_MODELS['finds_downstreamtreatments'] = ( + FindDownstreamTreatments, 'get-downstreamtreatment', '') @register.simple_tag(takes_context=True) diff --git a/ishtar_common/views.py b/ishtar_common/views.py index bbe790efa..8c784ac72 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -692,7 +692,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[], new_vals.append(u"{}{}{}".format( vals[idx], u' - ', format_val(v))) my_vals = new_vals[:] - data.append(", ".join(my_vals) or u"") + data.append(" ; ".join(my_vals) or u"") datas.append(data) if manual_sort_key: # +1 because the id is added as a first col @@ -793,6 +793,7 @@ def show_item(model, name, extra_dct=None): url_name = u"/".join(reverse('show-' + name, args=['0', ''] ).split('/')[:-2]) + u"/" dct['CURRENCY'] = get_current_profile().currency + dct['ENCODING'] = settings.ENCODING dct['current_window_url'] = url_name date = 'date' in dct and dct.pop('date') dct['window_id'] = "%s-%d-%s" % ( |