altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 5 Packages Projects Releases Wiki Activity

Offer text from latest approved revision in case there's no initial text

Browse source 
for a recharter submit form.
 - Legacy-Id: 4350
This commit is contained in:
Ole Laursen 2012-05-02 12:18:40 +00:00
parent 5fcd0297ed
commit c4298f602a
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ietf/wgcharter/views.py
View file

@ -245,9 +245,10 @@ def submit(request, name):
not_uploaded_yet = charter.rev.endswith("-00") and not os.path.exists(os.path.join(settings.CHARTER_PATH, '%s-%s.txt' % (charter.canonical_name(), charter.rev)))
if not_uploaded_yet:
# this case is special - we recently chartered or rechartered and have no file yet
next_rev = charter.rev
else:
# Search history for possible collisions with abandoned efforts
# search history for possible collisions with abandoned efforts
prev_revs = list(charter.history_set.order_by('-time').values_list('rev', flat=True))
next_rev = next_revision(charter.rev)
while next_rev in prev_revs:
@ -276,7 +277,17 @@ def submit(request, name):
return HttpResponseRedirect(reverse('doc_view', kwargs={'name': charter.name}))
else:
init = { "content": ""}
filename = os.path.join(settings.CHARTER_PATH, '%s-%s.txt' % (charter.canonical_name(), charter.rev))
c = charter
if not_uploaded_yet:
# use text from last approved revision
last_approved = charter.rev.split("-")[0]
h = charter.history_set.filter(rev=last_approved).order_by("-time", "-id")
if h:
c = h[0]
filename = os.path.join(settings.CHARTER_PATH, '%s-%s.txt' % (c.canonical_name(), c.rev))
try:
with open(filename, 'r') as f:
init["content"] = f.read()