Add required excludes to forms

6 files changed, 19 insertions, 2 deletions

diff --git a/postgresqleu/accounting/views.py b/postgresqleu/accounting/views.py
index 77a2b321..a8acf928 100644
--- a/postgresqleu/accounting/views.py
+++ b/postgresqleu/accounting/views.py
@@ -104,7 +104,7 @@ def entry(request, entryid):
 
 	extra = max(2, 6-entry.journalitem_set.count())
 	inlineformset = inlineformset_factory(JournalEntry, JournalItem, JournalItemForm, JournalItemFormset, can_delete=True, extra=extra)
-	inlineurlformset = inlineformset_factory(JournalEntry, JournalUrl, can_delete=True, extra=2)
+	inlineurlformset = inlineformset_factory(JournalEntry, JournalUrl, can_delete=True, extra=2, exclude=[])
 
 	if request.method == 'POST':
 		if request.POST['submit'] == 'Delete':
diff --git a/postgresqleu/confreg/admin.py b/postgresqleu/confreg/admin.py
index 66925325..6e5e5920 100644
--- a/postgresqleu/confreg/admin.py
+++ b/postgresqleu/confreg/admin.py
@@ -71,6 +71,7 @@ class AdditionalOptionListFilter(admin.SimpleListFilter):
 class ConferenceAdminForm(forms.ModelForm):
 	class Meta:
 		model = Conference
+		exclude = []
 	accounting_object = forms.ChoiceField(choices=[], required=False)
 
 	def __init__(self, *args, **kwargs):
@@ -86,6 +87,7 @@ class ConferenceAdmin(admin.ModelAdmin):
 class ConferenceRegistrationForm(forms.ModelForm):
 	class Meta:
 		model = ConferenceRegistration
+		exclude = []
 
 	def __init__(self, *args, **kwargs):
 		super(ConferenceRegistrationForm, self).__init__(*args, **kwargs)
@@ -195,6 +197,7 @@ class ConferenceSessionFeedbackAdmin(admin.ModelAdmin):
 class ConferenceSessionForm(forms.ModelForm):
 	class Meta:
 		model = ConferenceSession
+		exclude = []
 
 	def __init__(self, *args, **kwargs):
 		super(ConferenceSessionForm, self).__init__(*args, **kwargs)
@@ -270,6 +273,7 @@ class RegistrationDayAdmin(admin.ModelAdmin):
 class RegistrationTypeAdminForm(forms.ModelForm):
 	class Meta:
 		model = RegistrationType
+		exclude = []
 
 	def __init__(self, *args, **kwargs):
 		super(RegistrationTypeAdminForm, self).__init__(*args, **kwargs)
@@ -297,6 +301,7 @@ class ShirtsizeAdmin(admin.ModelAdmin):
 class ConferenceAdditionalOptionAdminForm(forms.ModelForm):
 	class Meta:
 		model = ConferenceAdditionalOption
+		exclude = []
 
 	def __init__(self, *args, **kwargs):
 		super(ConferenceAdditionalOptionAdminForm, self).__init__(*args, **kwargs)
@@ -337,6 +342,7 @@ class ConferenceAdditionalOptionAdmin(admin.ModelAdmin):
 class SpeakerAdminForm(forms.ModelForm):
 	class Meta:
 		model = Speaker
+		exclude = []
 
 	def clean_photofile(self):
 		if not self.cleaned_data['photofile']:
@@ -400,6 +406,7 @@ class PrepaidVoucherInline(admin.TabularInline):
 class PrepaidBatchAdminForm(forms.ModelForm):
 	class Meta:
 		model = PrepaidBatch
+		exclude = []
 
 	def __init__(self, *args, **kwargs):
 		super(PrepaidBatchAdminForm, self).__init__(*args, **kwargs)
@@ -432,6 +439,7 @@ class PrepaidBatchAdmin(admin.ModelAdmin):
 class PrepaidVoucherAdminForm(forms.ModelForm):
 	class Meta:
 		model = PrepaidVoucher
+		exclude = []
 
 	def __init__(self, *args, **kwargs):
 		super(PrepaidVoucherAdminForm, self).__init__(*args, **kwargs)
@@ -452,11 +460,14 @@ class PrepaidVoucherAdmin(admin.ModelAdmin):
 	buyername.allow_tags = True
 
 	def usedby(self, obj):
-		return "%s %s" % (obj.user.firstname, obj.user.lastname)
+		if obj.user:
+			return "%s %s" % (obj.user.firstname, obj.user.lastname)
+		return None
 
 class DiscountCodeAdminForm(forms.ModelForm):
 	class Meta:
 		model = DiscountCode
+		exclude = []
 
 	def __init__(self, *args, **kwargs):
 		super(DiscountCodeAdminForm, self).__init__(*args, **kwargs)
@@ -511,6 +522,7 @@ class BulkPaymentAdmin(admin.ModelAdmin):
 class AttendeeMailAdminForm(forms.ModelForm):
 	class Meta:
 		model = AttendeeMail
+		exclude = []
 
 	def __init__(self, *args, **kwargs):
 		super(AttendeeMailAdminForm, self).__init__(*args, **kwargs)
@@ -524,6 +536,7 @@ class AttendeeMailAdmin(admin.ModelAdmin):
 class PendingAdditionalOrderAdminForm(forms.ModelForm):
 	class Meta:
 		model = PendingAdditionalOrder
+		exclude = []
 
 	def __init__(self, *args, **kwargs):
 		super(PendingAdditionalOrderAdminForm, self).__init__(*args, **kwargs)
diff --git a/postgresqleu/confwiki/admin.py b/postgresqleu/confwiki/admin.py
index 55bfe7c1..a31fb0f8 100644
--- a/postgresqleu/confwiki/admin.py
+++ b/postgresqleu/confwiki/admin.py
@@ -8,6 +8,7 @@ from models import Wikipage, WikipageHistory, WikipageSubscriber
 class WikipageAdminForm(forms.ModelForm):
 	class Meta:
 		model = Wikipage
+		exclude = []
 
 	def __init__(self, *args, **kwargs):
 		super(WikipageAdminForm, self).__init__(*args, **kwargs)
diff --git a/postgresqleu/elections/admin.py b/postgresqleu/elections/admin.py
index 0d2267e7..f9b0c328 100644
--- a/postgresqleu/elections/admin.py
+++ b/postgresqleu/elections/admin.py
@@ -6,6 +6,7 @@ from models import Vote, Election, Candidate
 class VoteAdminForm(ModelForm):
 	class Meta:
 		model = Vote
+		exclude = []
 
 	def clean(self):
 		raise ValidationError("You really shouldn't edit votes! If you *really* need to fix something broken, do it in the db")
diff --git a/postgresqleu/invoices/admin.py b/postgresqleu/invoices/admin.py
index e99c7f47..2d84a3df 100644
--- a/postgresqleu/invoices/admin.py
+++ b/postgresqleu/invoices/admin.py
@@ -7,6 +7,7 @@ from models import Invoice, InvoiceLog, InvoiceProcessor, InvoicePaymentMethod
 class InvoiceAdminForm(forms.ModelForm):
 	class Meta:
 		model = Invoice
+		exclude = []
 
 	def clean_recipient_email(self):
 		if self.cleaned_data.has_key('finalized'):
diff --git a/postgresqleu/invoices/forms.py b/postgresqleu/invoices/forms.py
index 5a74259b..44ccb358 100644
--- a/postgresqleu/invoices/forms.py
+++ b/postgresqleu/invoices/forms.py
@@ -60,6 +60,7 @@ class InvoiceForm(forms.ModelForm):
 class InvoiceRowForm(forms.ModelForm):
 	class Meta:
 		model = InvoiceRow
+		exclude = []
 
 	def clean_rowamount(self):
 		if self.cleaned_data['rowamount'] == 0: