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

Merged in [13916] from alireza.mohammadi@icann.org:

Browse source 
Better punctuation during state change by adding \" before and after
old and new state.  Fixes issue #1545.
 - Legacy-Id: 13931
Note: SVN reference [13916] has been migrated to Git commit 07c3fe97fd
This commit is contained in:
Henrik Levkowetz 2017-07-17 14:25:29 +00:00
parent 4719d181a0 07c3fe97fd
commit c65015c30d
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ietf/doc/views_charter.py
View file

@ -103,7 +103,7 @@ def change_state(request, name, option=None):
e.time = group.time
e.by = by
e.state_id = group.state.slug
e.desc = "Group state changed to %s from %s" % (group.state, oldstate)
e.desc = "Group state changed to \"%s\" from \"%s\"" % (group.state, oldstate)
e.save()
else:
@ -145,7 +145,7 @@ def change_state(request, name, option=None):
email_charter_internal_review(request,charter)
if message or charter_state.slug == "intrev" or charter_state.slug == "extrev":
email_admin_re_charter(request, group, "Charter state changed to %s" % charter_state.name, message,'charter_state_edit_admin_needed')
email_admin_re_charter(request, group, "Charter state changed to \"%s\"" % charter_state.name, message,'charter_state_edit_admin_needed')
# TODO - do we need a seperate set of recipients for state changes to charters vrs other kind of documents
email_state_changed(request, charter, "State changed to %s." % charter_state, 'doc_state_edited')
@ -729,7 +729,7 @@ def approve(request, name):
charter.save_with_history(events)
email_admin_re_charter(request, group, "Charter state changed to %s" % new_charter_state.name, change_description,'charter_state_edit_admin_needed')
email_admin_re_charter(request, group, "Charter state changed to \"%s\"" % new_charter_state.name, change_description,'charter_state_edit_admin_needed')
# move milestones over
milestones_to_delete = list(group.groupmilestone_set.filter(state__in=("active", "review")))

2
ietf/sync/iana.py
View file

@ -207,7 +207,7 @@ def update_history_with_changes(changes, send_email=True):
doc.save_with_history([e])
if send_email and (state != prev_state):
email_state_changed(None, doc, "IANA %s state changed to %s" % (kind, state.name),'doc_iana_state_changed')
email_state_changed(None, doc, "IANA %s state changed to \"%s\"" % (kind, state.name),'doc_iana_state_changed')
return added_events, warnings

4
ready-for-merge
View file

@ -7,9 +7,9 @@
# --- Add entries at the top ---
/personal/sbirkholz/6.56.1.dev013917
/personal/sbirkholz/6.56.1.dev0@13917
/personal/alireza/6.56.1.dev0@13916
#/personal/alireza/6.56.1.dev0@13913
/personal/alireza/6.56.1.dev0@13913
/personal/alireza/6.56.1.dev0@13908
/personal/housley/6.56.1.dev0@13893