diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-25 10:15:31 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-25 10:15:31 +0200 |
commit | 6d2a86a17132ceb61a284110563b2df8c35fce77 (patch) | |
tree | 3d588aeb15ba6fa928176a95395e8b72951daa9f /archaeological_context_records | |
parent | 1f793e792d2feaa1da5191f9c23d23da919cc6a9 (diff) | |
parent | cc48605fa5e63dc315919858ead808c2be10836f (diff) | |
download | Ishtar-6d2a86a17132ceb61a284110563b2df8c35fce77.tar.bz2 Ishtar-6d2a86a17132ceb61a284110563b2df8c35fce77.zip |
Merge branch 'master' into develop
Diffstat (limited to 'archaeological_context_records')
-rw-r--r-- | archaeological_context_records/models.py | 3 | ||||
-rw-r--r-- | archaeological_context_records/views.py | 4 |
2 files changed, 5 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)], |