From fb6fbbb26b7f9d2b7ea2898b716bcd30993533da Mon Sep 17 00:00:00 2001 From: Michael Elkins Date: Thu, 22 Nov 2012 00:19:58 +0000 Subject: commiting work in progress svn path=/branches/tk329/; revision=4892 --- rpkid/rpki/gui/app/forms.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'rpkid/rpki/gui/app/forms.py') diff --git a/rpkid/rpki/gui/app/forms.py b/rpkid/rpki/gui/app/forms.py index cc64dc5e..f6b9547d 100644 --- a/rpkid/rpki/gui/app/forms.py +++ b/rpkid/rpki/gui/app/forms.py @@ -63,13 +63,21 @@ class GhostbusterRequestForm(forms.ModelForm): full_name = forms.CharField(max_length=40, required=False, help_text='automatically generated from family and given names if left blank') - def __init__(self, issuer, *args, **kwargs): + #override + issuer = forms.ModelChoiceField(queryset=None, widget=forms.HiddenInput) + + def __init__(self, *args, **kwargs): + conf = kwargs.pop('conf') + # override initial value for conf in case user tries to alter it + initial = kwargs.setdefault('initial', {}) + initial['issuer'] = conf super(GhostbusterRequestForm, self).__init__(*args, **kwargs) - self.fields['parent'].queryset = models.Parent.objects.filter(issuer=issuer) + self.fields['parent'].queryset = conf.parents.all() + self.fields['issuer'].queryset = models.Conf.objects.filter(pk=conf.pk) class Meta: model = models.GhostbusterRequest - exclude = ('issuer', 'vcard') + exclude = ('vcard') def clean(self): family_name = self.cleaned_data.get('family_name') -- cgit v1.2.3