Revert "Properly set debugging parameter in class"

Accidentally included part of unrelated development code :/

This reverts commit 93de76a0305fa582de2b9b9b7ab5ec8e6b8304a1.

diff --git a/postgresqleu/confreg/admin.py b/postgresqleu/confreg/admin.py
index 659ace6c2610168df2df0f25fad1ba50ca7e7b7f..e94d6bf7f1fa05835295da51e73b63b1817d3b99 100644 (file)
--- a/postgresqleu/confreg/admin.py
+++ b/postgresqleu/confreg/admin.py
@@ -22,7 +22,6 @@ from selectable.forms.widgets import AutoCompleteSelectWidget, AutoCompleteSelec
 from postgresqleu.accountinfo.lookups import UserLookup
 from postgresqleu.confreg.lookups import RegistrationLookup
 from postgresqleu.util.admin import SelectableWidgetAdminFormMixin
-from postgresqleu.util.forms import ConcurrentProtectedModelForm
 
 from util import notify_reg_confirmed
 
@@ -578,7 +577,8 @@ class PendingAdditionalOrderAdmin(admin.ModelAdmin):
        form = PendingAdditionalOrderAdminForm
        list_display = ('reg', 'createtime', 'payconfirmedat')
 
-class VolunteerSlotAdminForm(ConcurrentProtectedModelForm):
+
+class VolunteerSlotAdminForm(forms.ModelForm):
        class Meta:
                model = VolunteerSlot
                exclude = []

diff --git a/postgresqleu/confreg/jinjabadge.py b/postgresqleu/confreg/jinjabadge.py
index 68a11db9a3035ba8c619e435fa32d5c9d0f26e42..a4478e0bdb58cfbc267801253fb4da517ccc9ff6 100755 (executable)
--- a/postgresqleu/confreg/jinjabadge.py
+++ b/postgresqleu/confreg/jinjabadge.py
@@ -151,7 +151,6 @@ def test_inlist(v,l):
 class JinjaRenderer(object):
        def __init__(self, rootdir, debug=False):
                self.templatedir = os.path.join(rootdir, 'templates')
-               self.debug = debug
 
                if not os.path.exists(os.path.join(self.templatedir, 'badge.json')):
                        raise Exception("badge.json not found for conference")