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

Merged [4873] from rjsparks@nostrum.com:

Browse source 
Includes the conflict-review document contents in the email sent with the results of the conflict review.
Fixes bug 
 - Legacy-Id: 4944
Note: SVN reference [4873] has been migrated to Git commit d6579c63e6
This commit is contained in:
Henrik Levkowetz 2012-10-21 21:02:03 +00:00
parent 327ae948b1
commit 0efc882252
2 changed files with 5 additions and 5 deletions
ietf
doc
views_conflict_review.py
templates/doc/conflict_review
approval_text.txt

8
ietf/doc/views_conflict_review.py
View file

@ -286,10 +286,8 @@ def edit_ad(request, name):
def default_approval_text(review):
# Leaving these commented out lines for current_text to make it easy to put the actual review result into the approval email
# message should the stream owners decide that is a good thing.
#filename = "%s-%s.txt" % (review.canonical_name(), review.rev)
#current_text = get_document_content(filename, os.path.join(settings.CONFLICT_REVIEW_PATH, filename), split=False, markup=False)
filename = "%s-%s.txt" % (review.canonical_name(), review.rev)
current_text = get_document_content(filename, os.path.join(settings.CONFLICT_REVIEW_PATH, filename), split=False, markup=False)
conflictdoc = review.relateddocument_set.get(relationship__slug='conflrev').target.document
if conflictdoc.stream_id=='ise':
@ -304,7 +302,7 @@ def default_approval_text(review):
conflictdoc = conflictdoc,
conflictdoc_url = settings.IDTRACKER_BASE_URL+conflictdoc.get_absolute_url(),
receiver=receiver,
#approved_review = current_text
approved_review = current_text
)
)

2
ietf/templates/doc/conflict_review/approval_text.txt
View file

@ -11,6 +11,8 @@ The IESG recommends that '{{ conflictdoc.title }}' {{ conflictdoc.file_tag|safe
The IESG has no problem with the publication of '{{ conflictdoc.title }}' {{ conflictdoc.file_tag|safe }} as {{ conflictdoc|std_level_prompt_with_article }}.
{% endif %}
{{ approved_review }}
The IESG would also like the {{receiver}} to review the comments in the datatracker related to this document and determine whether or not they merit incorporation into the document. Comments may exist in both the ballot and the history log.
The IESG review is documented at: