From 3c7d546816009ebf39e9ce57f3517775f31d8e80 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Fri, 20 Apr 2012 12:54:24 +0000 Subject: [PATCH] Swap order of event generation in previous commit. - Legacy-Id: 4294 --- ietf/wgcharter/views.py | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/ietf/wgcharter/views.py b/ietf/wgcharter/views.py index a000bc657..4b06dc9de 100644 --- a/ietf/wgcharter/views.py +++ b/ietf/wgcharter/views.py @@ -463,21 +463,6 @@ def approve(request, name): close_open_ballots(charter, login) - # according to spec, 00-02 becomes 01, so copy file and record new revision - try: - old = os.path.join(charter.get_file_path(), '%s-%s.txt' % (charter.canonical_name(), charter.rev)) - new = os.path.join(charter.get_file_path(), '%s-%s.txt' % (charter.canonical_name(), next_approved_revision(charter.rev))) - shutil.copy(old, new) - except IOError: - raise Http404("Charter text %s" % filename) - - charter.rev = next_approved_revision(charter.rev) - - e = NewRevisionDocEvent(doc=charter, by=login, type="new_revision") - e.desc = "New version available: %s-%s.txt" % (charter.canonical_name(), charter.rev) - e.rev = charter.rev - e.save() - # approve e = DocEvent(doc=charter, by=login) e.type = "iesg_approved" @@ -497,9 +482,23 @@ def approve(request, name): e = log_state_changed(request, charter, login, prev_charter_state) + # according to spec, 00-02 becomes 01, so copy file and record new revision + try: + old = os.path.join(charter.get_file_path(), '%s-%s.txt' % (charter.canonical_name(), charter.rev)) + new = os.path.join(charter.get_file_path(), '%s-%s.txt' % (charter.canonical_name(), next_approved_revision(charter.rev))) + shutil.copy(old, new) + except IOError: + raise Http404("Charter text %s" % filename) + + e = NewRevisionDocEvent(doc=charter, by=login, type="new_revision") + e.desc = "New version available: %s-%s.txt" % (charter.canonical_name(), charter.rev) + e.rev = next_approved_revision(charter.rev) + e.save() + + charter.rev = e.rev charter.time = e.time charter.save() - + email_secretariat(request, wg, "state-%s" % new_charter_state.slug, change_description) # send announcement