Skip to content

Commit 7747e3a

Browse files
committed
Only trim ballot discusses/comments on the right side, not the left,
since some ADs are using the left-side for formatting, fixes ietf-tools#782. - Legacy-Id: 4022
1 parent d8c6b6b commit 7747e3a

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

ietf/idrfc/testsREDESIGN.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -434,15 +434,15 @@ def test_edit_position(self):
434434
events_before = draft.docevent_set.count()
435435

436436
r = self.client.post(url, dict(position="discuss",
437-
discuss="This is a discussion test.",
438-
comment="This is a test."))
437+
discuss=" This is a discussion test. \n ",
438+
comment=" This is a test. \n "))
439439
self.assertEquals(r.status_code, 302)
440440

441441
pos = draft.latest_event(BallotPositionDocEvent, ad=ad)
442442
self.assertEquals(pos.pos.slug, "discuss")
443-
self.assertTrue("This is a discussion test." in pos.discuss)
443+
self.assertTrue(" This is a discussion test." in pos.discuss)
444444
self.assertTrue(pos.discuss_time != None)
445-
self.assertTrue("This is a test." in pos.comment)
445+
self.assertTrue(" This is a test." in pos.comment)
446446
self.assertTrue(pos.comment_time != None)
447447
self.assertTrue("New position" in pos.desc)
448448
self.assertEquals(draft.docevent_set.count(), events_before + 3)

ietf/idrfc/views_ballot.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,9 @@ def edit_positionREDESIGN(request, name):
266266
pos.type = "changed_ballot_position"
267267
pos.ad = ad
268268
pos.pos = clean["position"]
269-
pos.comment = clean["comment"].strip()
269+
pos.comment = clean["comment"].rstrip()
270270
pos.comment_time = old_pos.comment_time if old_pos else None
271-
pos.discuss = clean["discuss"].strip()
271+
pos.discuss = clean["discuss"].rstrip()
272272
pos.discuss_time = old_pos.discuss_time if old_pos else None
273273

274274
changes = []

0 commit comments

Comments
 (0)