diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-09 18:09:37 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-09 18:11:10 +0100 |
| commit | e8373b2d7c1ef6c554aeadd93b577001b049000e (patch) | |
| tree | c65b5086bd4db147751de5a0d7d1b578d9c8944e /ishtar_common | |
| parent | 042861251b5615c5c89740b82e45862c8fcde088 (diff) | |
| download | Ishtar-e8373b2d7c1ef6c554aeadd93b577001b049000e.tar.bz2 Ishtar-e8373b2d7c1ef6c554aeadd93b577001b049000e.zip | |
Contex record: fix relation tables
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/templatetags/window_tables.py | 5 | ||||
| -rw-r--r-- | ishtar_common/views.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ishtar_common/templatetags/window_tables.py b/ishtar_common/templatetags/window_tables.py index fc2ba3874..2fc364f25 100644 --- a/ishtar_common/templatetags/window_tables.py +++ b/ishtar_common/templatetags/window_tables.py @@ -15,7 +15,8 @@ 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, RecordRelationView + ContextRecordSource, RecordRelationView, \ + RecordRelations as CRRecordRelations from archaeological_finds.models import Find, FindSource, \ FindUpstreamTreatments, FindDownstreamTreatments, FindTreatments from archaeological_warehouse.models import Container @@ -42,6 +43,8 @@ ASSOCIATED_MODELS['context_records_docs'] = ( 'get-contextrecordsource', 'get-contextrecordsource-full') ASSOCIATED_MODELS['context_records_relations'] = ( RecordRelationView, 'get-contextrecordrelation', '') +ASSOCIATED_MODELS['context_records_relations_detail'] = ( + CRRecordRelations, 'get-contextrecordrelationdetail', '') ASSOCIATED_MODELS['finds'] = (Find, 'get-find', 'get-find-full') ASSOCIATED_MODELS['finds_for_ope'] = ( diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 5f37a4dbf..1e272fc78 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -827,7 +827,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[], and request.session[model_name] if current: dct = {upper_key: current} - query = query & Q(**dct) + query &= Q(**dct) items = model.objects.filter(query).distinct() # print(items.query) |