diff --git a/modoboa/extensions/admin/views/alias.py b/modoboa/extensions/admin/views/alias.py index dc4e8a04e..f5f6eb608 100644 --- a/modoboa/extensions/admin/views/alias.py +++ b/modoboa/extensions/admin/views/alias.py @@ -1,5 +1,5 @@ import reversion -from django.db import transaction, IntegrityError +from django.db import IntegrityError from django.utils.translation import ugettext as _, ungettext from django.shortcuts import render from django.core.urlresolvers import reverse @@ -56,7 +56,6 @@ def _new_alias(request, title, action, successmsg, @login_required @permission_required("admin.add_alias") -@transaction.commit_on_success @reversion.create_revision() def newdlist(request): return _new_alias( @@ -67,7 +66,6 @@ def newdlist(request): @login_required @permission_required("admin.add_alias") -@transaction.commit_on_success @reversion.create_revision() def newalias(request): return _new_alias( @@ -78,7 +76,6 @@ def newalias(request): @login_required @permission_required("admin.add_alias") -@transaction.commit_on_success @reversion.create_revision() def newforward(request): return _new_alias( @@ -89,7 +86,6 @@ def newforward(request): @login_required @permission_required("admin.change_alias") -@transaction.commit_on_success @reversion.create_revision() def editalias(request, alid, tplname="admin/aliasform.html"): alias = Alias.objects.get(pk=alid) @@ -118,7 +114,6 @@ def editalias(request, alid, tplname="admin/aliasform.html"): @login_required @permission_required("admin.delete_alias") -@transaction.commit_on_success def delalias(request): selection = request.GET["selection"].split(",") for alid in selection: diff --git a/modoboa/extensions/admin/views/domain.py b/modoboa/extensions/admin/views/domain.py index cb94bc3a5..2c7647bdd 100644 --- a/modoboa/extensions/admin/views/domain.py +++ b/modoboa/extensions/admin/views/domain.py @@ -2,7 +2,6 @@ import reversion from django.http import HttpResponseRedirect from django.utils.translation import ugettext as _, ungettext from django.core.urlresolvers import reverse -from django.db import transaction from django.shortcuts import render from django.views.decorators.csrf import ensure_csrf_cookie from django.contrib.auth.decorators import ( @@ -88,7 +87,6 @@ def domains_list(request): @login_required @permission_required("admin.add_domain") -@transaction.commit_on_success @reversion.create_revision() def newdomain(request, tplname="common/wizard_forms.html"): events.raiseEvent("CanCreate", request.user, "domains") @@ -120,7 +118,7 @@ def newdomain(request, tplname="common/wizard_forms.html"): try: cwizard.steps[1]["form"].save(request.user, domain) except ModoboaException as e: - transaction.rollback() + #transaction.rollback() raise return render_to_json_response(_("Domain created")) return render_to_json_response({ @@ -140,7 +138,6 @@ def newdomain(request, tplname="common/wizard_forms.html"): @login_required @permission_required("admin.view_domains") -@transaction.commit_on_success @reversion.create_revision() def editdomain(request, dom_id, tplname="admin/editdomainform.html"): domain = Domain.objects.get(pk=dom_id) @@ -177,7 +174,6 @@ def editdomain(request, dom_id, tplname="admin/editdomainform.html"): @login_required @permission_required("admin.delete_domain") -@transaction.commit_on_success def deldomain(request, dom_id): keepdir = True if request.POST.get("keepdir", "false") == "true" else False try: diff --git a/modoboa/extensions/admin/views/identity.py b/modoboa/extensions/admin/views/identity.py index a5af940ce..b7fc8fe6c 100644 --- a/modoboa/extensions/admin/views/identity.py +++ b/modoboa/extensions/admin/views/identity.py @@ -1,6 +1,5 @@ import reversion from django.shortcuts import render -from django.db import transaction from django.utils.translation import ugettext as _, ungettext from django.core.urlresolvers import reverse from django.contrib.auth.decorators import ( @@ -114,7 +113,6 @@ def list_quotas(request, tplname="admin/quotas.html"): @login_required @permission_required("core.add_user") -@transaction.commit_on_success @reversion.create_revision() def newaccount(request, tplname='common/wizard_forms.html'): """Create a new account. @@ -167,7 +165,6 @@ def newaccount(request, tplname='common/wizard_forms.html'): @login_required @permission_required("core.change_user") -@transaction.commit_on_success @reversion.create_revision() def editaccount(request, accountid, tplname="common/tabforms.html"): account = User.objects.get(pk=accountid) @@ -209,7 +206,6 @@ def editaccount(request, accountid, tplname="common/tabforms.html"): @login_required @permission_required("core.delete_user") -@transaction.commit_on_success def delaccount(request, accountid): keepdir = True if request.POST.get("keepdir", "false") == "true" else False User.objects.get(pk=accountid).delete(request.user, keep_mb_dir=keepdir) diff --git a/modoboa/extensions/admin/views/import.py b/modoboa/extensions/admin/views/import.py index 2251d23c1..b98e0e3b7 100644 --- a/modoboa/extensions/admin/views/import.py +++ b/modoboa/extensions/admin/views/import.py @@ -3,7 +3,6 @@ import reversion from django.utils.translation import ugettext as _ from django.shortcuts import render from django.core.urlresolvers import reverse -from django.db import transaction from django.contrib.auth.decorators import ( login_required, permission_required, user_passes_test ) @@ -16,14 +15,12 @@ from modoboa.extensions.admin.models import ( from modoboa.extensions.admin.forms import ImportIdentitiesForm, ImportDataForm -@transaction.commit_on_success def import_domain(user, row, formopts): """Specific code for domains import""" dom = Domain() dom.from_csv(user, row) -@transaction.commit_on_success def import_domainalias(user, row, formopts): """Specific code for domain aliases import""" domalias = DomainAlias() @@ -32,7 +29,6 @@ def import_domainalias(user, row, formopts): @login_required @permission_required("admin.add_domain") -@transaction.commit_on_success def import_domains(request): if request.method == "POST": return importdata(request) @@ -61,14 +57,12 @@ def import_domains(request): return render(request, "admin/importform.html", ctx) -@transaction.commit_on_success def import_account(user, row, formopts): """Specific code for accounts import""" account = User() account.from_csv(user, row, formopts["crypt_password"]) -@transaction.commit_on_success def _import_alias(user, row, **kwargs): """Specific code for aliases import""" alias = Alias()