Merge remote-tracking branch 'floppya/django-1.6-transactions'

Fix Django 1.6 transactions

Author: vdboor

polymorphic_tree/admin/parentadmin.py

@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.core.urlresolvers import reverse
-from django.db.transaction import commit_on_success
+from django.db import transaction
 from django.http import HttpResponseNotFound, HttpResponse, HttpResponseBadRequest, HttpResponseRedirect
 from django.utils.translation import ugettext_lazy as _
 from polymorphic.admin import PolymorphicParentModelAdmin, PolymorphicModelChoiceForm
@@ -16,6 +16,12 @@
     from django.conf.urls.defaults import url
 
 
+try:
+    transaction_atomic = transaction.atomic
+except AttributeError:
+    transaction_atomic = transaction.commit_on_success
+
+
 class NodeTypeChoiceForm(PolymorphicModelChoiceForm):
     type_label = _("Node type")
 
@@ -156,7 +162,7 @@ def api_node_moved_view_url(self):
         return reverse('admin:{0}_{1}_moved'.format(*info))
 
 
-    @commit_on_success
+    @transaction_atomic
     def api_node_moved_view(self, request):
         """
         Update the position of a node, from a API request.