diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-17 19:27:59 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-17 19:27:59 +0200 |
| commit | 4be9edb096c6685245b4a997130e1016578c1ff7 (patch) | |
| tree | cbb21e7b1e42aec0e763e3322863055b0c468dcc /ishtar_common | |
| parent | 84f9336f71dd70a8bb040b17eab4c753669c4276 (diff) | |
| parent | 64bb69c03ce1688c72b3f7ebd0e1550cd941aa69 (diff) | |
| download | Ishtar-4be9edb096c6685245b4a997130e1016578c1ff7.tar.bz2 Ishtar-4be9edb096c6685245b4a997130e1016578c1ff7.zip | |
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/locale/django.pot | 6 | ||||
| -rw-r--r-- | ishtar_common/templatetags/window_tables.py | 5 | ||||
| -rw-r--r-- | ishtar_common/widgets.py | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index 8a0b6b389..4759a7e47 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -1458,15 +1458,15 @@ msgstr "" msgid "Search..." msgstr "" -#: widgets.py:608 templatetags/window_tables.py:76 +#: widgets.py:610 templatetags/window_tables.py:79 msgid "No results" msgstr "" -#: widgets.py:609 templatetags/window_tables.py:77 +#: widgets.py:611 templatetags/window_tables.py:80 msgid "Loading..." msgstr "" -#: widgets.py:610 +#: widgets.py:612 msgid "Remove" msgstr "" diff --git a/ishtar_common/templatetags/window_tables.py b/ishtar_common/templatetags/window_tables.py index 578d94535..acb3d4a0a 100644 --- a/ishtar_common/templatetags/window_tables.py +++ b/ishtar_common/templatetags/window_tables.py @@ -15,7 +15,7 @@ from ishtar_common.widgets import JQueryJqGrid from archaeological_files.models import File from archaeological_operations.models import OperationSource, Operation from archaeological_context_records.models import ContextRecord, \ - ContextRecordSource + ContextRecordSource, RecordRelations as CRRecordRelations from archaeological_finds.models import Find, FindSource, \ FindUpstreamTreatments, FindDownstreamTreatments @@ -39,6 +39,9 @@ ASSOCIATED_MODELS['context_records_for_ope'] = ( ASSOCIATED_MODELS['context_records_docs'] = ( ContextRecordSource, 'get-contextrecordsource', 'get-contextrecordsource-full') +ASSOCIATED_MODELS['context_records_relations'] = ( + CRRecordRelations, 'get-contextrecordrelation', '') + ASSOCIATED_MODELS['finds'] = (Find, 'get-find', 'get-find-full') ASSOCIATED_MODELS['finds_for_ope'] = ( Find, 'get-find-for-ope', 'get-find-full') diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py index 89eead988..48d1377fa 100644 --- a/ishtar_common/widgets.py +++ b/ishtar_common/widgets.py @@ -564,6 +564,8 @@ class JQueryJqGrid(forms.RadioSelect): field_verbose_names.append(unicode(field_verbose_name)) if field_name in col_labels: jq_col_names.append(unicode(col_labels[field_name])) + elif col_names and col_names[0] in col_labels: + jq_col_names.append(unicode(col_labels[col_names[0]])) else: jq_col_names.append(settings.JOINT.join( [f for f in field_verbose_names if f])) |