diff --git a/ietf/doc/tests_ballot.py b/ietf/doc/tests_ballot.py index d3954632b..2c5e47a48 100644 --- a/ietf/doc/tests_ballot.py +++ b/ietf/doc/tests_ballot.py @@ -393,9 +393,6 @@ class BallotWriteupsTests(TestCase): ballot_writeup="This is a simple test.", save_ballot_writeup="1")) self.assertEqual(r.status_code, 200) - msgs = [m for m in r.context['messages']] - self.assertTrue(1 == len(msgs)) - self.assertTrue("Writeup not changed" in msgs[0].message) d = Document.objects.get(name=draft.name) self.assertTrue('approved' == d.get_state_slug('draft-iesg')) diff --git a/ietf/doc/views_ballot.py b/ietf/doc/views_ballot.py index a4693e5f2..71f03dce6 100644 --- a/ietf/doc/views_ballot.py +++ b/ietf/doc/views_ballot.py @@ -8,7 +8,6 @@ import datetime, json from django import forms from django.conf import settings -from django.contrib import messages from django.http import HttpResponse, HttpResponseRedirect, Http404 from django.shortcuts import render, get_object_or_404, redirect from django.template.defaultfilters import striptags @@ -608,19 +607,19 @@ def ballot_writeupnotes(request, name): if form.is_valid(): if prev_state.slug in ['ann', 'approved', 'rfcqueue', 'pub']: ballot_already_approved = True - messages.warning(request, "There is an approved ballot for %s. Writeup not changed." % doc.name) else: ballot_already_approved = False - t = form.cleaned_data["ballot_writeup"] - if t != existing.text: - e = WriteupDocEvent(doc=doc, rev=doc.rev, by=login) - e.by = login - e.type = "changed_ballot_writeup_text" - e.desc = "Ballot writeup was changed" - e.text = t - e.save() - elif existing.pk == None: - existing.save() + + t = form.cleaned_data["ballot_writeup"] + if t != existing.text: + e = WriteupDocEvent(doc=doc, rev=doc.rev, by=login) + e.by = login + e.type = "changed_ballot_writeup_text" + e.desc = "Ballot writeup was changed" + e.text = t + e.save() + elif existing.pk == None: + existing.save() if "issue_ballot" in request.POST and not ballot_already_approved: if prev_state.slug in ['watching', 'writeupw', 'goaheadw']: