Moved the database transaction control from the save() method in the data model to the form view, to avoid double transactions.
This commit is contained in:
parent
04703df6b5
commit
926d61f534
@ -178,7 +178,6 @@ class Transaction(DirtyFieldsMixin, BaseModel):
|
|||||||
for record in to_save:
|
for record in to_save:
|
||||||
record.current_user = self.current_user
|
record.current_user = self.current_user
|
||||||
# Runs the update
|
# Runs the update
|
||||||
with transaction.atomic():
|
|
||||||
super().save(force_insert=force_insert, force_update=force_update,
|
super().save(force_insert=force_insert, force_update=force_update,
|
||||||
using=using, update_fields=update_fields)
|
using=using, update_fields=update_fields)
|
||||||
for record in to_delete:
|
for record in to_delete:
|
||||||
@ -199,9 +198,7 @@ class Transaction(DirtyFieldsMixin, BaseModel):
|
|||||||
for i in range(len(txn_same_day)):
|
for i in range(len(txn_same_day)):
|
||||||
if txn_same_day[i].ord != i + 1:
|
if txn_same_day[i].ord != i + 1:
|
||||||
txn_to_sort.append([txn_same_day[i], i + 1])
|
txn_to_sort.append([txn_same_day[i], i + 1])
|
||||||
with transaction.atomic():
|
Record.objects.filter(transaction=self).delete()
|
||||||
for record in self.record_set.all():
|
|
||||||
record.delete()
|
|
||||||
super().delete(using=using, keep_parents=keep_parents)
|
super().delete(using=using, keep_parents=keep_parents)
|
||||||
for x in txn_to_sort:
|
for x in txn_to_sort:
|
||||||
Transaction.objects.filter(pk=x[0].pk).update(ord=x[1])
|
Transaction.objects.filter(pk=x[0].pk).update(ord=x[1])
|
||||||
|
@ -24,6 +24,7 @@ from dirtyfields import DirtyFieldsMixin
|
|||||||
from django import forms
|
from django import forms
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
from django.contrib.messages.views import SuccessMessageMixin
|
from django.contrib.messages.views import SuccessMessageMixin
|
||||||
|
from django.db import transaction
|
||||||
from django.db.models import Model
|
from django.db.models import Model
|
||||||
from django.http import HttpResponse, HttpRequest, \
|
from django.http import HttpResponse, HttpRequest, \
|
||||||
HttpResponseRedirect, Http404
|
HttpResponseRedirect, Http404
|
||||||
@ -157,6 +158,7 @@ class FormView(View):
|
|||||||
and not self.object.is_dirty(check_relationship=True):
|
and not self.object.is_dirty(check_relationship=True):
|
||||||
message = self.get_not_modified_message(form.cleaned_data)
|
message = self.get_not_modified_message(form.cleaned_data)
|
||||||
else:
|
else:
|
||||||
|
with transaction.atomic():
|
||||||
self.object.save()
|
self.object.save()
|
||||||
message = self.get_success_message(form.cleaned_data)
|
message = self.get_success_message(form.cleaned_data)
|
||||||
messages.success(self.request, message)
|
messages.success(self.request, message)
|
||||||
|
Loading…
Reference in New Issue
Block a user