Merge pull request #220 from Russell-Jones/master

Add try catch block to test for and use if available new in 1.6 db trans...

wiki/models/urlpath.py

@@ -7,6 +7,13 @@ from django.contrib.sites.models import Site
 from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse
 from django.db import models, transaction
+
+#Django 1.6 transaction API, required for 1.8+
+try:
+   notrans=transaction.non_atomic_requests 
+except:
+   notrans=transaction.commit_manually
+
 from django.db.models.signals import post_save, pre_delete
 from django.utils.translation import ugettext_lazy as _, ugettext
 
@@ -108,7 +115,7 @@ class URLPath(MPTTModel):
                 return ancestor
         return None
     
-    @transaction.commit_manually
+    @notrans
     def delete_subtree(self):
         """
         NB! This deletes this urlpath, its children, and ALL of the related

wiki/views/article.py

@@ -20,6 +20,13 @@ from wiki.core.diff import simple_merge
 from wiki.decorators import get_article, json_view
 from django.core.urlresolvers import reverse
 from django.db import transaction
+
+#Django 1.6 transaction API, required for 1.8+
+try:
+   notrans=transaction.non_atomic_requests 
+except:
+   notrans=transaction.commit_manually
+
 from wiki.core.exceptions import NoRootURL
 from wiki.core import permissions
 from django.http import Http404
@@ -60,7 +67,7 @@ class Create(FormView, ArticleMixin):
         form.fields['slug'].widget = forms.TextInputPrepend(prepend='/'+self.urlpath.path)
         return form
 
-    @transaction.commit_manually
+    @notrans
     def form_valid(self, form):
         user=None
         ip_address = None