Use request.build_absolute_uri instead of grabbing the domain from the
current Site in the review code - Legacy-Id: 11753
This commit is contained in:
parent
220a7f6608
commit
78062adc2f
|
@ -1,6 +1,5 @@
|
|||
import datetime, os, email.utils
|
||||
|
||||
from django.contrib.sites.models import Site
|
||||
from django.http import HttpResponseForbidden, JsonResponse
|
||||
from django.shortcuts import render, get_object_or_404, redirect
|
||||
from django import forms
|
||||
|
@ -8,6 +7,7 @@ from django.contrib.auth.decorators import login_required
|
|||
from django.utils.html import mark_safe
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.template.loader import render_to_string
|
||||
from django.core.urlresolvers import reverse as urlreverse
|
||||
|
||||
from ietf.doc.models import Document, NewRevisionDocEvent, DocEvent, State, DocAlias
|
||||
from ietf.ietfauth.utils import is_authorized_in_doc_stream, user_is_person, has_role
|
||||
|
@ -447,8 +447,11 @@ def complete_review(request, name, request_id):
|
|||
|
||||
subject = "Review of {}-{} completed partially".format(review_req.doc.name, review_req.reviewed_rev)
|
||||
|
||||
url = urlreverse("ietf.doc.views_review.review_request", kwargs={ "name": new_review_req.doc.name, "request_id": new_review_req.pk })
|
||||
url = request.build_absolute_uri(url)
|
||||
|
||||
msg = render_to_string("doc/mail/partially_completed_review.txt", {
|
||||
"domain": Site.objects.get_current().domain,
|
||||
'new_review_req_url': url,
|
||||
"by": request.user.person,
|
||||
"new_review_req": new_review_req,
|
||||
})
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import datetime, re
|
||||
from collections import defaultdict
|
||||
|
||||
from django.contrib.sites.models import Site
|
||||
from django.db import models
|
||||
from django.core.urlresolvers import reverse as urlreverse
|
||||
|
||||
from ietf.group.models import Group, Role
|
||||
from ietf.doc.models import Document, DocEvent, State, LastCallDocEvent, DocumentAuthor, DocAlias
|
||||
|
@ -77,8 +77,10 @@ def email_review_request_change(request, review_req, subject, msg, by, notify_se
|
|||
if not to:
|
||||
return
|
||||
|
||||
url = urlreverse("ietf.doc.views_review.review_request", kwargs={ "name": review_req.doc.name, "request_id": review_req.pk })
|
||||
url = request.build_absolute_uri(url)
|
||||
send_mail(request, to, None, subject, "doc/mail/review_request_changed.txt", {
|
||||
"domain": Site.objects.get_current().domain,
|
||||
"review_req_url": url,
|
||||
"review_req": review_req,
|
||||
"msg": msg,
|
||||
})
|
||||
|
|
|
@ -2,5 +2,5 @@
|
|||
|
||||
A new review request has been registered for completing the review:
|
||||
|
||||
https://{{ domain }}{% url "ietf.doc.views_review.review_request" name=new_review_req.doc.name request_id=new_review_req.pk %}
|
||||
{{ new_review_req_url }}
|
||||
{% endautoescape %}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
{{ review_req.type.name }} review of: {{ review_req.doc.name }} ({% if review_req.requested_rev %}rev. {{ review_req.requested_rev }}{% else %}no specific version{% endif %})
|
||||
Deadline: {% if review_req.deadline|date:"H:i" != "23:59" %}{{ review_req.deadline|date:"Y-m-d H:i" }}{% else %}{{ review_req.deadline|date:"Y-m-d" }}{% endif %}
|
||||
|
||||
https://{{ domain }}{% url "ietf.doc.views_review.review_request" name=review_req.doc.name request_id=review_req.pk %}
|
||||
{{ review_req_url }}
|
||||
|
||||
{{ msg|wordwrap:72 }}
|
||||
|
||||
|
|
Loading…
Reference in a new issue