Merge branch 'master' into develop

4 files changed, 26 insertions, 2 deletions

diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index ea6b97fd4..925a48597 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -630,6 +630,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)
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)],
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index 71f31981a..fdd3a5e63 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 = {
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
@@ -5016,6 +5016,17 @@
     }
 },
 {
+    "model": "auth.permission",
+    "fields": {
+        "name": "Can view all record relations - view",
+        "content_type": [
+            "archaeological_context_records",
+            "recordrelationview"
+        ],
+        "codename": "view_recordrelation"
+    }
+},
+{
     "model": "auth.group",
     "fields": {
         "name": "Op\u00e9rations : lecture",
@@ -5060,6 +5071,11 @@
                 "view_recordrelation",
                 "archaeological_context_records",
                 "recordrelations"
+            ],
+            [
+                "view_recordrelation",
+                "archaeological_context_records",
+                "recordrelationview"
             ]
         ]
     }