From 258779bb55e77216b058a3b4ab121ccb1a405102 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 24 Oct 2017 18:22:03 +0200 Subject: Fix permissions for contexte record relations table --- archaeological_context_records/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py index 3bfe544be..242ccadec 100644 --- a/archaeological_context_records/views.py +++ b/archaeological_context_records/views.py @@ -81,11 +81,11 @@ get_contextrecordsource = get_item( get_contextrecordrelation = get_item( models.RecordRelationView, 'get_contextrecordrelation', - 'contextrecordrelation') + 'contextrecordrelation', specific_perms=['view_recordrelation']) get_contextrecordrelationdetail = get_item( models.RecordRelations, 'get_contextrecordrelationdetail', - 'contextrecordrelationdetail') + 'contextrecordrelationdetail', specific_perms=['view_recordrelation']) record_search_wizard = SearchWizard.as_view([ ('general-record_search', RecordFormSelection)], -- cgit v1.2.3 From a4e44bcd1446781e759436a795ba8130fdbd4659 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 24 Oct 2017 18:28:26 +0200 Subject: Container table: fix fetch request --- archaeological_warehouse/models.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 41891b341..a7865cf0e 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -262,6 +262,11 @@ class Container(LightHistorizedItem, ImageModel): 'location': 'location__pk', 'container_type': 'container_type__pk', 'reference': 'reference__icontains', + 'finds__base_finds__context_record__operation': + 'finds__base_finds__context_record__operation', + 'finds__base_finds__context_record': + 'finds__base_finds__context_record', + 'finds': 'finds', } SHOW_URL = 'show-container' COL_LABELS = { -- cgit v1.2.3 From be7cd2a17aeff396a74513037f4abfefe51a7920 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 24 Oct 2017 18:39:04 +0200 Subject: Permissions: add a permission fo record relation view --- archaeological_context_records/models.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 9f0117869..082d4f53c 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -623,6 +623,9 @@ class RecordRelationView(models.Model): managed = False db_table = 'record_relations' unique_together = ('id', 'right_record') + permissions = [ + ("view_recordrelation", u"Can view all record relations - view"), + ] def __unicode__(self): return u"{} \"{}\"".format(self.relation_type, self.right_record) -- cgit v1.2.3 From 9f17817b0e89348ae82f88f21befb9568349fbc1 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 24 Oct 2017 18:51:35 +0200 Subject: Fixtures: add context record relation view permission --- fixtures/initial_data-auth-fr.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/fixtures/initial_data-auth-fr.json b/fixtures/initial_data-auth-fr.json index 87eb1d3a1..4fa4af0e1 100644 --- a/fixtures/initial_data-auth-fr.json +++ b/fixtures/initial_data-auth-fr.json @@ -5015,6 +5015,17 @@ "codename": "view_recordrelation" } }, +{ + "model": "auth.permission", + "fields": { + "name": "Can view all record relations - view", + "content_type": [ + "archaeological_context_records", + "recordrelationview" + ], + "codename": "view_recordrelation" + } +}, { "model": "auth.group", "fields": { @@ -5060,6 +5071,11 @@ "view_recordrelation", "archaeological_context_records", "recordrelations" + ], + [ + "view_recordrelation", + "archaeological_context_records", + "recordrelationview" ] ] } -- cgit v1.2.3