Minor code updatse to support django 1.8

diff --git a/gitadmin/gitadmin/adm/urls.py b/gitadmin/gitadmin/adm/urls.py
index f9c37e8fa4c1e24544d3e66d57911dffffb8fddd..728cff8881e0360b8cd75e80fec36afcd3a1c2db 100644 (file)
--- a/gitadmin/gitadmin/adm/urls.py
+++ b/gitadmin/gitadmin/adm/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns
 
 urlpatterns = patterns('',
     (r'^$', 'gitadmin.adm.views.index'),

diff --git a/gitadmin/gitadmin/adm/views.py b/gitadmin/gitadmin/adm/views.py
index 29c8c75f5e586702f1f57edf8188b566db907af2..cd25b82381fd8b95d4468313058df71dabe2edd1 100644 (file)
--- a/gitadmin/gitadmin/adm/views.py
+++ b/gitadmin/gitadmin/adm/views.py
@@ -52,14 +52,14 @@ def help(request):
        return render_to_response('help.html')
 
 @login_required
-@transaction.commit_on_success
+@transaction.atomic
 def editrepo(request, repoid):
        repo = get_object_or_404(Repository, repoid=repoid)
        repo.ValidateOwnerPermissions(request.user)
        savedat = None
        form = None
 
-       formfactory = inlineformset_factory(Repository, RepositoryPermission, extra=1)
+       formfactory = inlineformset_factory(Repository, RepositoryPermission, extra=1, fields=['userid','level'])
 
        if request.method == "POST":
                form = RepositoryForm(data=request.POST, instance=repo)
@@ -119,7 +119,7 @@ def editrepo(request, repoid):
 
 
 @login_required
-@transaction.commit_on_success
+@transaction.atomic
 def deleterepo(request, repoid):
        repo = get_object_or_404(Repository, repoid=repoid)
        repo.ValidateOwnerPermissions(request.user)
@@ -139,7 +139,7 @@ def deleterepo(request, repoid):
 
 
 @login_required
-@transaction.commit_on_success
+@transaction.atomic
 def newrepo(request):
        if request.method != "POST":
                raise Exception("Must be posted!")

diff --git a/gitadmin/gitadmin/urls.py b/gitadmin/gitadmin/urls.py
index 5fb32dae54855544c6a0ba251027499c62d2cd39..bd9a393add3ab94e321dd79b176724ce5e9b3232 100644 (file)
--- a/gitadmin/gitadmin/urls.py
+++ b/gitadmin/gitadmin/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, include
 
 # Uncomment the next two lines to enable the admin:
 from django.contrib import admin