Skip to content

Commit e896ead

Browse files
committed
Merged [5001] from jmh@joelhalpern.com:
Make comments optional on WG adoption and WG state changes. - Legacy-Id: 5016 Note: SVN reference [5001] has been migrated to Git commit 1057dbf
1 parent cfcce2f commit e896ead

7 files changed

Lines changed: 11 additions & 11 deletions

File tree

debug.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from pprint import pformat
1212
except ImportError:
1313
pformat = lambda x: x
14-
14+
1515
import cProfile
1616
try:
1717
from django.conf import settings
@@ -146,4 +146,4 @@ def wrapper(*args, **kwargs):
146146
return decorator(wrapper, fn)
147147
else:
148148
return fn
149-
149+

ietf/ietfworkflows/forms.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def __unicode__(self):
5151

5252

5353
class NoWorkflowStateForm(StreamDraftForm):
54-
comment = forms.CharField(widget=forms.Textarea)
54+
comment = forms.CharField(widget=forms.Textarea, required=False)
5555
weeks = forms.IntegerField(required=False)
5656
wg = forms.ChoiceField(required=False)
5757

@@ -150,7 +150,7 @@ def save(self):
150150

151151
class DraftTagsStateForm(StreamDraftForm):
152152

153-
comment = forms.CharField(widget=forms.Textarea)
153+
comment = forms.CharField(widget=forms.Textarea, required=False)
154154
new_state = forms.ChoiceField()
155155
weeks = forms.IntegerField(required=False)
156156
tags = forms.MultipleChoiceField(widget=forms.CheckboxSelectMultiple, required=False)

ietf/templates/ietfworkflows/noworkflow_state_form.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<tr style="vertical-align: top;"><td style="width: 50%;">
77
<div class="field{% if form.errors.comment %} error{% endif %}">
88
{{ form.comment.errors }}
9-
Comment: <span class="required">*</span><br />
9+
Comment: <br/>
1010
<textarea name="comment">{{ form.data.comment }}</textarea>
1111
</div>
1212
<div class="field{% if form.errors.weeks %} error{% endif %}">

ietf/templates/ietfworkflows/state_form.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<tr style="vertical-align: top;"><td style="width: 50%;">
88
<div class="field{% if form.comment.errors %} error{% endif %}">
99
{{ form.comment.errors }}
10-
Comment: <span class="required">*</span><br />
10+
Comment: <br/>
1111
<textarea name="comment">{{ form.data.comment }}</textarea>
1212
</div>
1313
<div class="field{% if form.weeks.errors %} error{% endif %}">

test/sprint80.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ shane shane@time-travellers.org Shane Kerr
77
kivinen kivinen@iki.fi Tero Kivinen
88
adam adam@nostrum.com Adam Roach
99
peter peter.musgrave@magorcorp.com Peter Musgrave
10-
julian julian.reschke@greenbytes.de Julian Reschke
10+
julian julian.reschke@gmx.de Julian Reschke
1111
warren warren@kumari.net Warren Kumari
1212
jelte jelte@isc.org Jelte Jansen
1313
bmheight bmheight@gmail.com Brandon Height
14-
lars lars.eggert@gmail.com Lars Eggert
14+
lars lars.eggert@nokia.com Lars Eggert

test/sprint81.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
henrik henrik@levkowetz.com Henrik Levkowetz
22
rjs rjs@nostrum.com Robert Sparks
33
housley housley@vigilsec.com Russ Housley
4-
lars lars.eggert@gmail.com Lars Eggert
4+
lars lars.eggert@nokia.com Lars Eggert
55
adam adam@nostrum.com Adam Roach
6-
kivinen kivinen@iki.fi Tero Kivinen
6+
kivinen kivinen@iki.fi Tero Kivinne
77
suresh suresh.krishnan@ericsson.com Suresh Krishnan
88
wes wes@mti-systems.com Wes Eddy
99
dow dow.street@linquest.com Dow Street

test/sprint82.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ henrik henrik@levkowetz.com Henrik Levkowetz
22
rjs rjs@nostrum.com Robert Sparks
33
housley housley@vigilsec.com Russ Housley
44
adam adam@nostrum.com Adam Roach
5-
lars lars.eggert@gmail.com Lars Eggert
5+
lars lars.eggert@nokia.com Lars Eggert
66
kivinen kivinen@iki.fi Tero Kivinen
77
tony tony@att.com Tony Hansen
88
mahoney mahoney@nostrum.com Jean Mahoney

0 commit comments

Comments
 (0)