diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-24 16:51:34 +0200 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-24 16:51:34 +0200 | 
| commit | 479e6a0ca7fb5bb68579baeafd0daf286352c1ad (patch) | |
| tree | 193c04ef439e070d99fda55ceb875fe216ff97fd | |
| parent | e0cc865516f69dcea9649e571d2f3a71963bfbb4 (diff) | |
| parent | e31ba4e008f8c0813143029283892ff215e9b521 (diff) | |
| download | Ishtar-479e6a0ca7fb5bb68579baeafd0daf286352c1ad.tar.bz2 Ishtar-479e6a0ca7fb5bb68579baeafd0daf286352c1ad.zip | |
Merge branch 'master' into develop
| -rw-r--r-- | archaeological_context_records/models.py | 4 | ||||
| -rw-r--r-- | archaeological_operations/models.py | 3 | 
2 files changed, 7 insertions, 0 deletions
| diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index a8517ed26..ea6b97fd4 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -578,6 +578,10 @@ class RecordRelations(GeneralRecordRelations, models.Model):      class Meta:          verbose_name = _(u"Record relation")          verbose_name_plural = _(u"Record relations") +        permissions = [ +            ("view_recordrelation", u"Can view all Context record relations"), +        ] +  post_delete.connect(post_delete_record_relation, sender=RecordRelations) diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index dd3e65534..70c1c02ba 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -853,6 +853,9 @@ class RecordRelations(GeneralRecordRelations, models.Model):          verbose_name = _(u"Operation record relation")          verbose_name_plural = _(u"Operation record relations")          ordering = ('left_record', 'relation_type') +        permissions = [ +            ("view_operationrelation", u"Can view all Operation relations"), +        ]  post_delete.connect(post_delete_record_relation, sender=RecordRelations) | 
