Specified strip=False for another bunch of CharField form fields with Textarea widgets.

 - Legacy-Id: 12711

Author: levkowetz

ietf/doc/admin.py

@@ -81,7 +81,7 @@ def clean(self, value):
 class DocumentForm(forms.ModelForm):
     states = StatesField(queryset=State.objects.all(), required=False)
     comment_about_changes = forms.CharField(
-        widget=forms.Textarea(attrs={'rows':10,'cols':40,'class':'vLargeTextField'}),
+        widget=forms.Textarea(attrs={'rows':10,'cols':40,'class':'vLargeTextField'}), strip=False,
         help_text="This comment about the changes made will be saved in the document history.")
 
     def __init__(self, *args, **kwargs):

ietf/doc/views_ballot.py

@@ -90,8 +90,8 @@ def position_label(position_value):
 # -------------------------------------------------
 class EditPositionForm(forms.Form):
     position = forms.ModelChoiceField(queryset=BallotPositionName.objects.all(), widget=forms.RadioSelect, initial="norecord", required=True)
-    discuss = forms.CharField(required=False, widget=forms.Textarea)
-    comment = forms.CharField(required=False, widget=forms.Textarea)
+    discuss = forms.CharField(required=False, widget=forms.Textarea, strip=False)
+    comment = forms.CharField(required=False, widget=forms.Textarea, strip=False)
 
     def __init__(self, *args, **kwargs):
         ballot_type = kwargs.pop("ballot_type")
@@ -414,7 +414,7 @@ def undefer_ballot(request, name):
                                    back_url=doc.get_absolute_url()))
 
 class LastCallTextForm(forms.Form):
-    last_call_text = forms.CharField(widget=forms.Textarea, required=True)
+    last_call_text = forms.CharField(widget=forms.Textarea, required=True, strip=False)
 
     def clean_last_call_text(self):
         lines = self.cleaned_data["last_call_text"].split("\r\n")
@@ -500,7 +500,7 @@ def lastcalltext(request, name):
                                    ))
 
 class BallotWriteupForm(forms.Form):
-    ballot_writeup = forms.CharField(widget=forms.Textarea, required=True)
+    ballot_writeup = forms.CharField(widget=forms.Textarea, required=True, strip=False)
 
     def clean_ballot_writeup(self):
         return self.cleaned_data["ballot_writeup"].replace("\r", "")
@@ -592,7 +592,7 @@ def ballot_writeupnotes(request, name):
                                    ))
 
 class BallotRfcEditorNoteForm(forms.Form):
-    rfc_editor_note = forms.CharField(widget=forms.Textarea, label="RFC Editor Note", required=True)
+    rfc_editor_note = forms.CharField(widget=forms.Textarea, label="RFC Editor Note", required=True, strip=False)
 
     def clean_rfc_editor_note(self):
         return self.cleaned_data["rfc_editor_note"].replace("\r", "")
@@ -643,7 +643,7 @@ def ballot_rfceditornote(request, name):
                                    ))
 
 class ApprovalTextForm(forms.Form):
-    approval_text = forms.CharField(widget=forms.Textarea, required=True)
+    approval_text = forms.CharField(widget=forms.Textarea, required=True, strip=False)
 
     def clean_approval_text(self):
         return self.cleaned_data["approval_text"].replace("\r", "")

ietf/doc/views_charter.py

@@ -37,8 +37,8 @@
 class ChangeStateForm(forms.Form):
     charter_state = forms.ModelChoiceField(State.objects.filter(used=True, type="charter"), label="Charter state", empty_label=None, required=False)
     initial_time = forms.IntegerField(initial=0, label="Review time", help_text="(in weeks)", required=False)
-    message = forms.CharField(widget=forms.Textarea, help_text="Leave blank to change state without notifying the Secretariat.", required=False, label=mark_safe("Message to the Secretariat"))
-    comment = forms.CharField(widget=forms.Textarea, help_text="Optional comment for the charter history.", required=False)
+    message = forms.CharField(widget=forms.Textarea, help_text="Leave blank to change state without notifying the Secretariat.", required=False, label=mark_safe("Message to the Secretariat"), strip=False)
+    comment = forms.CharField(widget=forms.Textarea, help_text="Optional comment for the charter history.", required=False, strip=False)
     def __init__(self, *args, **kwargs):
         self.hide = kwargs.pop('hide', None)
         group = kwargs.pop('group')
@@ -233,8 +233,8 @@ def state_pk(slug):
 
 class ChangeTitleForm(forms.Form):
     charter_title = forms.CharField(widget=forms.TextInput, label="Charter title", help_text="Enter new charter title.", required=True)
-    message = forms.CharField(widget=forms.Textarea, help_text="Leave blank to change the title without notifying the Secretariat.", required=False, label=mark_safe("Message to Secretariat"))
-    comment = forms.CharField(widget=forms.Textarea, help_text="Optional comment for the charter history.", required=False)
+    message = forms.CharField(widget=forms.Textarea, help_text="Leave blank to change the title without notifying the Secretariat.", required=False, label=mark_safe("Message to Secretariat"), strip=False)
+    comment = forms.CharField(widget=forms.Textarea, help_text="Optional comment for the charter history.", required=False, strip=False)
     def __init__(self, *args, **kwargs):
         charter = kwargs.pop('charter')
         super(ChangeTitleForm, self).__init__(*args, **kwargs)
@@ -335,7 +335,7 @@ def edit_ad(request, name):
 
 
 class UploadForm(forms.Form):
-    content = forms.CharField(widget=forms.Textarea, label="Charter text", help_text="Edit the charter text.", required=False)
+    content = forms.CharField(widget=forms.Textarea, label="Charter text", help_text="Edit the charter text.", required=False, strip=False)
     txt = forms.FileField(label=".txt format", help_text="Or upload a .txt file.", required=False)
 
     def clean_content(self):
@@ -454,15 +454,15 @@ def submit(request, name, option=None):
     })
 
 class ActionAnnouncementTextForm(forms.Form):
-    announcement_text = forms.CharField(widget=forms.Textarea, required=True)
+    announcement_text = forms.CharField(widget=forms.Textarea, required=True, strip=False)
 
     def clean_announcement_text(self):
         return self.cleaned_data["announcement_text"].replace("\r", "")
 
 
 class ReviewAnnouncementTextForm(forms.Form):
-    announcement_text = forms.CharField(widget=forms.Textarea, required=True)
-    new_work_text = forms.CharField(widget=forms.Textarea, required=True)
+    announcement_text = forms.CharField(widget=forms.Textarea, required=True, strip=False)
+    new_work_text = forms.CharField(widget=forms.Textarea, required=True, strip=False)
 
     def clean_announcement_text(self):
         return self.cleaned_data["announcement_text"].replace("\r", "")
@@ -612,7 +612,7 @@ def action_announcement_text(request, name):
                   ))
 
 class BallotWriteupForm(forms.Form):
-    ballot_writeup = forms.CharField(widget=forms.Textarea, required=True)
+    ballot_writeup = forms.CharField(widget=forms.Textarea, required=True, strip=False)
 
     def clean_ballot_writeup(self):
         return self.cleaned_data["ballot_writeup"].replace("\r", "")

ietf/doc/views_conflict_review.py

@@ -24,7 +24,7 @@
 
 class ChangeStateForm(forms.Form):
     review_state = forms.ModelChoiceField(State.objects.filter(used=True, type="conflrev"), label="Conflict review state", empty_label=None, required=True)
-    comment = forms.CharField(widget=forms.Textarea, help_text="Optional comment for the review history.", required=False)
+    comment = forms.CharField(widget=forms.Textarea, help_text="Optional comment for the review history.", required=False, strip=False)
 
 @role_required("Area Director", "Secretariat")
 def change_state(request, name, option=None):
@@ -126,7 +126,7 @@ def send_conflict_eval_email(request,review):
                addrs.cc)
 
 class UploadForm(forms.Form):
-    content = forms.CharField(widget=forms.Textarea, label="Conflict review response", help_text="Edit the conflict review response.", required=False)
+    content = forms.CharField(widget=forms.Textarea, label="Conflict review response", help_text="Edit the conflict review response.", required=False, strip=False)
     txt = forms.FileField(label=".txt format", help_text="Or upload a .txt file.", required=False)
 
     def clean_content(self):
@@ -277,7 +277,7 @@ def default_approval_text(review):
 
 
 class AnnouncementForm(forms.Form):
-    announcement_text = forms.CharField(widget=forms.Textarea, label="IETF Conflict Review Announcement", help_text="Edit the announcement message.", required=True)
+    announcement_text = forms.CharField(widget=forms.Textarea, label="IETF Conflict Review Announcement", help_text="Edit the announcement message.", required=True, strip=False)
 
 @role_required("Secretariat")
 def approve(request, name):

ietf/doc/views_doc.py

@@ -972,7 +972,7 @@ def extract_name(s):
     return HttpResponse(json.dumps(data, indent=2), content_type='application/json')
 
 class AddCommentForm(forms.Form):
-    comment = forms.CharField(required=True, widget=forms.Textarea)
+    comment = forms.CharField(required=True, widget=forms.Textarea, strip=False)
 
 @role_required('Area Director', 'Secretariat', 'IRTF Chair', 'WG Chair', 'RG Chair', 'WG Secretary', 'RG Secretary', 'IANA', 'RFC Editor')
 def add_comment(request, name):

ietf/doc/views_draft.py

@@ -44,7 +44,7 @@
 class ChangeStateForm(forms.Form):
     state = forms.ModelChoiceField(State.objects.filter(used=True, type="draft-iesg"), empty_label=None, required=True)
     substate = forms.ModelChoiceField(DocTagName.objects.filter(slug__in=IESG_SUBSTATE_TAGS), required=False)
-    comment = forms.CharField(widget=forms.Textarea, required=False)
+    comment = forms.CharField(widget=forms.Textarea, required=False, strip=False)
 
     def clean(self):
         retclean = self.cleaned_data
@@ -210,7 +210,7 @@ def change_iana_state(request, name, state_type):
 
 class ChangeStreamForm(forms.Form):
     stream = forms.ModelChoiceField(StreamName.objects.exclude(slug="legacy"), required=False)
-    comment = forms.CharField(widget=forms.Textarea, required=False)
+    comment = forms.CharField(widget=forms.Textarea, required=False, strip=False)
 
 @login_required
 def change_stream(request, name):
@@ -292,7 +292,7 @@ def doc_ajax_internet_draft(request):
 
 class ReplacesForm(forms.Form):
     replaces = SearchableDocAliasesField(required=False)
-    comment = forms.CharField(widget=forms.Textarea, required=False)
+    comment = forms.CharField(widget=forms.Textarea, required=False, strip=False)
 
     def __init__(self, *args, **kwargs):
         self.doc = kwargs.pop('doc')
@@ -344,7 +344,7 @@ class SuggestedReplacesForm(forms.Form):
     replaces = forms.ModelMultipleChoiceField(queryset=DocAlias.objects.all(),
                                               label="Suggestions", required=False, widget=forms.CheckboxSelectMultiple,
                                               help_text="Select only the documents that are replaced by this document")
-    comment = forms.CharField(label="Optional comment", widget=forms.Textarea, required=False)
+    comment = forms.CharField(label="Optional comment", widget=forms.Textarea, required=False, strip=False)
 
     def __init__(self, suggested, *args, **kwargs):
         super(SuggestedReplacesForm, self).__init__(*args, **kwargs)
@@ -404,7 +404,7 @@ def review_possibly_replaces(request, name):
 
 class ChangeIntentionForm(forms.Form):
     intended_std_level = forms.ModelChoiceField(IntendedStdLevelName.objects.filter(used=True), empty_label="(None)", required=True, label="Intended RFC status")
-    comment = forms.CharField(widget=forms.Textarea, required=False)
+    comment = forms.CharField(widget=forms.Textarea, required=False, strip=False)
 
 def change_intention(request, name):
     """Change the intended publication status of a Document of type 'draft' , notifying parties 
@@ -474,7 +474,7 @@ class EditInfoForm(forms.Form):
     ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active",role__group__type='area').order_by('name'), label="Responsible AD", empty_label="(None)", required=True)
     create_in_state = forms.ModelChoiceField(State.objects.filter(used=True, type="draft-iesg", slug__in=("pub-req", "watching")), empty_label=None, required=False)
     notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas.", required=False)
-    note = forms.CharField(widget=forms.Textarea, label="IESG note", required=False)
+    note = forms.CharField(widget=forms.Textarea, label="IESG note", required=False, strip=False)
     telechat_date = forms.TypedChoiceField(coerce=lambda x: datetime.datetime.strptime(x, '%Y-%m-%d').date(), empty_value=None, required=False, widget=forms.Select(attrs={'onchange':'make_bold()'}))
     returning_item = forms.BooleanField(required=False)
 
@@ -812,7 +812,7 @@ def resurrect(request, name):
                                    back_url=doc.get_absolute_url()))
 
 class IESGNoteForm(forms.Form):
-    note = forms.CharField(widget=forms.Textarea, label="IESG note", required=False)
+    note = forms.CharField(widget=forms.Textarea, label="IESG note", required=False, strip=False)
 
     def clean_note(self):
         # not munging the database content to use html line breaks --
@@ -858,7 +858,7 @@ def edit_iesg_note(request, name):
                                    ))
 
 class ShepherdWriteupUploadForm(forms.Form):
-    content = forms.CharField(widget=forms.Textarea, label="Shepherd writeup", help_text="Edit the shepherd writeup.", required=False)
+    content = forms.CharField(widget=forms.Textarea, label="Shepherd writeup", help_text="Edit the shepherd writeup.", required=False, strip=False)
     txt = forms.FileField(label=".txt format", help_text="Or upload a .txt file.", required=False)
 
     def clean_content(self):
@@ -1116,7 +1116,7 @@ def edit_consensus(request, name):
 
 class PublicationForm(forms.Form):
     subject = forms.CharField(max_length=200, required=True)
-    body = forms.CharField(widget=forms.Textarea, required=True)
+    body = forms.CharField(widget=forms.Textarea, required=True, strip=False)
 
 def request_publication(request, name):
     """Request publication by RFC Editor for a document which hasn't
@@ -1210,7 +1210,7 @@ def request_publication(request, name):
 class AdoptDraftForm(forms.Form):
     group = forms.ModelChoiceField(queryset=Group.objects.filter(type__in=["wg", "rg"], state="active").order_by("-type", "acronym"), required=True, empty_label=None)
     newstate = forms.ModelChoiceField(queryset=State.objects.filter(type__in=['draft-stream-ietf','draft-stream-irtf'],slug__in=['wg-cand', 'c-adopt', 'adopt-wg', 'info', 'wg-doc', 'candidat','active']),required=True,label="State")
-    comment = forms.CharField(widget=forms.Textarea, required=False, label="Comment", help_text="Optional comment explaining the reasons for the adoption.")
+    comment = forms.CharField(widget=forms.Textarea, required=False, label="Comment", help_text="Optional comment explaining the reasons for the adoption.", strip=False)
     weeks = forms.IntegerField(required=False, label="Expected weeks in adoption state")
 
     def __init__(self, *args, **kwargs):
@@ -1334,7 +1334,7 @@ def adopt_draft(request, name):
 class ChangeStreamStateForm(forms.Form):
     new_state = forms.ModelChoiceField(queryset=State.objects.filter(used=True), label='State' )
     weeks = forms.IntegerField(label='Expected weeks in state',required=False)
-    comment = forms.CharField(widget=forms.Textarea, required=False, help_text="Optional comment for the document history.")
+    comment = forms.CharField(widget=forms.Textarea, required=False, help_text="Optional comment for the document history.", strip=False)
     tags = forms.ModelMultipleChoiceField(queryset=DocTagName.objects.filter(used=True), widget=forms.CheckboxSelectMultiple, required=False)
 
     def __init__(self, *args, **kwargs):

ietf/doc/views_material.py

@@ -31,7 +31,7 @@ def choose_material_type(request, acronym):
 class UploadMaterialForm(forms.Form):
     title = forms.CharField(max_length=Document._meta.get_field("title").max_length)
     name = forms.CharField(max_length=Document._meta.get_field("name").max_length)
-    abstract = forms.CharField(max_length=Document._meta.get_field("abstract").max_length,widget=forms.Textarea)
+    abstract = forms.CharField(max_length=Document._meta.get_field("abstract").max_length,widget=forms.Textarea, strip=False)
     state = forms.ModelChoiceField(State.objects.all(), empty_label=None)
     material = forms.FileField(label='File')
 

ietf/doc/views_review.py

@@ -284,7 +284,7 @@ def assign_reviewer(request, name, request_id):
     })
 
 class RejectReviewerAssignmentForm(forms.Form):
-    message_to_secretary = forms.CharField(widget=forms.Textarea, required=False, help_text="Optional explanation of rejection, will be emailed to team secretary if filled in")
+    message_to_secretary = forms.CharField(widget=forms.Textarea, required=False, help_text="Optional explanation of rejection, will be emailed to team secretary if filled in", strip=False)
 
 @login_required
 def reject_reviewer_assignment(request, name, request_id):
@@ -354,7 +354,7 @@ class CompleteReviewForm(forms.Form):
 
     review_url = forms.URLField(label="Link to message", required=False)
     review_file = forms.FileField(label="Text file to upload", required=False)
-    review_content = forms.CharField(widget=forms.Textarea, required=False)
+    review_content = forms.CharField(widget=forms.Textarea, required=False, strip=False)
     completion_date = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={ "autoclose": "1" }, initial=datetime.date.today, help_text="Date of announcement of the results of this review")
     completion_time = forms.TimeField(widget=forms.HiddenInput, initial=datetime.time.min)
     cc = MultiEmailField(required=False, help_text="Email addresses to send to in addition to the review team list")
@@ -621,7 +621,7 @@ def search_mail_archive(request, name, request_id):
     return JsonResponse(res)
 
 class EditReviewRequestCommentForm(forms.ModelForm):
-    comment = forms.CharField(widget=forms.Textarea)
+    comment = forms.CharField(widget=forms.Textarea, strip=False)
     class Meta:
         fields = ['comment',]
         model = ReviewRequest

ietf/doc/views_status_change.py

@@ -25,7 +25,7 @@
 
 class ChangeStateForm(forms.Form):
     new_state = forms.ModelChoiceField(State.objects.filter(type="statchg", used=True), label="Status Change Evaluation State", empty_label=None, required=True)
-    comment = forms.CharField(widget=forms.Textarea, help_text="Optional comment for the review history.", required=False)
+    comment = forms.CharField(widget=forms.Textarea, help_text="Optional comment for the review history.", required=False, strip=False)
 
 
 @role_required("Area Director", "Secretariat")
@@ -305,7 +305,7 @@ def default_approval_text(status_change,relateddoc):
 from django.forms.formsets import formset_factory
 
 class AnnouncementForm(forms.Form):
-    announcement_text = forms.CharField(widget=forms.Textarea, label="Status Change Announcement", help_text="Edit the announcement message.", required=True)
+    announcement_text = forms.CharField(widget=forms.Textarea, label="Status Change Announcement", help_text="Edit the announcement message.", required=True, strip=False)
     label = None
 
     def __init__(self, *args, **kwargs):

ietf/group/views.py

@@ -481,7 +481,7 @@ def group_about_status_meeting(request, acronym, num, group_type=None):
                  )
 
 class StatusUpdateForm(forms.Form):
-    content = forms.CharField(widget=forms.Textarea, label='Status update', help_text = 'Edit the status update', required=False)
+    content = forms.CharField(widget=forms.Textarea, label='Status update', help_text = 'Edit the status update', required=False, strip=False)
     txt = forms.FileField(label='.txt format', help_text='Or upload a .txt file', required=False)
 
     def clean_content(self):