From 12d42a480448cfab37279de2abfe17de0b9d97fb Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Thu, 31 Dec 2015 14:55:31 +0100
Subject: [PATCH] Code updates for django 1.8

---
 hamnadmin/hamnadmin/register/admin.py |  1 +
 hamnadmin/hamnadmin/register/urls.py  |  2 +-
 hamnadmin/hamnadmin/register/views.py | 16 ++++++++--------
 hamnadmin/hamnadmin/settings.py       |  2 ++
 hamnadmin/hamnadmin/urls.py           |  2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/hamnadmin/hamnadmin/register/admin.py b/hamnadmin/hamnadmin/register/admin.py
index 69219c3..70c04ee 100644
--- a/hamnadmin/hamnadmin/register/admin.py
+++ b/hamnadmin/hamnadmin/register/admin.py
@@ -8,6 +8,7 @@ from hamnadmin.register.models import *
 class BlogAdminForm(forms.ModelForm):
 	class Meta:
 		model = Blog
+		exclude = []
 
 	def clean_approved(self):
 		if self.cleaned_data['approved'] != self.instance.approved:
diff --git a/hamnadmin/hamnadmin/register/urls.py b/hamnadmin/hamnadmin/register/urls.py
index 27a0b5f..bfc4c40 100644
--- a/hamnadmin/hamnadmin/register/urls.py
+++ b/hamnadmin/hamnadmin/register/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 # Uncomment the next two lines to enable the admin:
 from django.contrib import admin
diff --git a/hamnadmin/hamnadmin/register/views.py b/hamnadmin/hamnadmin/register/views.py
index b2f128c..f2b09d7 100644
--- a/hamnadmin/hamnadmin/register/views.py
+++ b/hamnadmin/hamnadmin/register/views.py
@@ -29,7 +29,7 @@ def root(request):
 	}, context_instance=RequestContext(request))
 
 @login_required
-@transaction.commit_on_success
+@transaction.atomic
 def new(request):
 	if not request.method== 'POST':
 		raise pExcept('must be POST')
@@ -108,7 +108,7 @@ http://planet.postgresql.org/register/admin/register/blog/
 	return HttpResponseRedirect('..')
 
 @login_required
-@transaction.commit_on_success
+@transaction.atomic
 def delete(request, id):
 	blog = get_object_or_404(Blog, id=id)
 	if not blog.userid == request.user.username:
@@ -122,7 +122,7 @@ The user '%s' has deleted the blog at
 	return HttpResponseRedirect('../..')
 
 @login_required
-@transaction.commit_on_success
+@transaction.atomic
 def reset(request, id):
 	blog = get_object_or_404(Blog, id=id)
 	if not blog.userid == request.user.username:
@@ -133,7 +133,7 @@ def reset(request, id):
 	return HttpResponseRedirect('../..')
 
 @user_passes_test(issuperuser)
-@transaction.commit_on_success
+@transaction.atomic
 def discover(request, id):
 	blog = get_object_or_404(Blog, id=id)
 
@@ -163,7 +163,7 @@ def logview(request, id):
 	}, context_instance=RequestContext(request))
 
 @login_required
-@transaction.commit_on_success
+@transaction.atomic
 def blogposts(request, id):
 	blog = get_object_or_404(Blog, id=id)
 	if not blog.userid == request.user.username and not request.user.is_superuser:
@@ -192,17 +192,17 @@ def __setposthide(request, blogid, postid, status):
 	return HttpResponseRedirect('../..')
 
 @login_required
-@transaction.commit_on_success
+@transaction.atomic
 def blogpost_hide(request, blogid, postid):
 	return __setposthide(request, blogid, postid, True)
 
 @login_required
-@transaction.commit_on_success
+@transaction.atomic
 def blogpost_unhide(request, blogid, postid):
 	return __setposthide(request, blogid, postid, False)
 
 @login_required
-@transaction.commit_on_success
+@transaction.atomic
 def blogpost_delete(request, blogid, postid):
 	post = __getvalidblogpost(request, blogid, postid)
 
diff --git a/hamnadmin/hamnadmin/settings.py b/hamnadmin/hamnadmin/settings.py
index e4a806e..649f41a 100644
--- a/hamnadmin/hamnadmin/settings.py
+++ b/hamnadmin/hamnadmin/settings.py
@@ -66,6 +66,8 @@ AUTHENTICATION_BACKENDS = (
 
 LOGIN_URL = '/register/login'
 
+ALLOWED_HOSTS=['*']
+
 # If there is a local_settings.py, let it override our settings
 try:
 	from local_settings import *
diff --git a/hamnadmin/hamnadmin/urls.py b/hamnadmin/hamnadmin/urls.py
index a512bd7..2318a44 100644
--- a/hamnadmin/hamnadmin/urls.py
+++ b/hamnadmin/hamnadmin/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 # Uncomment the next two lines to enable the admin:
 # from django.contrib import admin
-- 
2.39.5