rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-22 19:33:11 +00:00
Code Issues Releases Wiki Activity

Merge branch 'Fix_116' into 'master'

Browse source 
Fix #116: Remove default SOA in Extension & Force reversion context

Closes #116

See merge request federez/re2o!147
This commit is contained in:
chirac 2018-05-10 21:51:26 +02:00
commit e064db626d
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
machines/models.py
View file

@ -541,8 +541,7 @@ class Extension(RevMixin, AclMixin, models.Model):
) )
soa = models.ForeignKey( soa = models.ForeignKey(
'SOA', 'SOA',
on_delete=models.CASCADE, on_delete=models.CASCADE
default=SOA.new_default_soa
) )
class Meta: class Meta:

10
re2o/mixins.py
View file

@ -24,6 +24,7 @@ A set of mixins used all over the project to avoid duplicating code
""" """
from reversion import revisions as reversion from reversion import revisions as reversion
from django.db import transaction
class RevMixin(object): class RevMixin(object):
@ -33,13 +34,16 @@ class RevMixin(object):
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
""" Creates a version of this object and save it to database """ """ Creates a version of this object and save it to database """
if self.pk is None: if self.pk is None:
reversion.set_comment("Création") with transaction.atomic(), reversion.create_revision():
reversion.set_comment("Création")
return super(RevMixin, self).save(*args, **kwargs)
return super(RevMixin, self).save(*args, **kwargs) return super(RevMixin, self).save(*args, **kwargs)
def delete(self, *args, **kwargs): def delete(self, *args, **kwargs):
""" Creates a version of this object and delete it from database """ """ Creates a version of this object and delete it from database """
reversion.set_comment("Suppresion") with transaction.atomic(), reversion.create_revision():
return super(RevMixin, self).delete(*args, **kwargs) reversion.set_comment("Suppresion")
return super(RevMixin, self).delete(*args, **kwargs)
class FormRevMixin(object): class FormRevMixin(object):