Skip to content

Commit 424a454

Browse files
committed
Chage initial_text to show above of input in nominate form
Fixes ietf-tools#1010 - Legacy-Id: 5702
1 parent ddbfdf4 commit 424a454

5 files changed

Lines changed: 337 additions & 32 deletions

File tree

ietf/nomcom/forms.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -273,11 +273,13 @@ def done(self, request, cleaned_data):
273273

274274
class EditNomcomForm(BaseNomcomForm, forms.ModelForm):
275275

276-
fieldsets = [('Edit nomcom settings', ('public_key', 'send_questionnaire', 'reminder_interval'))]
276+
fieldsets = [('Edit nomcom settings', ('public_key', 'initial_text',
277+
'send_questionnaire', 'reminder_interval'))]
277278

278279
class Meta:
279280
model = NomCom
280-
fields = ('public_key', 'send_questionnaire', 'reminder_interval')
281+
fields = ('public_key', 'initial_text',
282+
'send_questionnaire', 'reminder_interval')
281283

282284

283285
class MergeForm(BaseNomcomForm, forms.Form):
@@ -387,6 +389,7 @@ def __init__(self, *args, **kwargs):
387389

388390
if self.nomcom:
389391
self.fields['position'].queryset = Position.objects.get_by_nomcom(self.nomcom).opened()
392+
self.fields['comments'].help_text = self.nomcom.initial_text
390393

391394
if not self.public:
392395
fieldset = ['nominator_email'] + fieldset
@@ -547,10 +550,6 @@ class Meta:
547550
fields = ('position', 'nominator_email', 'candidate_name',
548551
'candidate_email', 'candidate_phone')
549552

550-
class Media:
551-
js = ("/js/jquery-1.5.1.min.js",
552-
"/js/nomcom.js", )
553-
554553

555554
class FeedbackForm(BaseNomcomForm, forms.ModelForm):
556555
position_name = forms.CharField(label='position',
@@ -740,12 +739,11 @@ class NomComTemplateForm(BaseNomcomForm, DBTemplateForm):
740739
class PositionForm(BaseNomcomForm, forms.ModelForm):
741740

742741
fieldsets = [('Position', ('name', 'description',
743-
'initial_text',
744742
'is_open', 'incumbent'))]
745743

746744
class Meta:
747745
model = Position
748-
fields = ('name', 'description', 'initial_text', 'is_open', 'incumbent')
746+
fields = ('name', 'description', 'is_open', 'incumbent')
749747

750748
def __init__(self, *args, **kwargs):
751749
self.nomcom = kwargs.pop('nomcom', None)

0 commit comments

Comments
 (0)