diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py index aa94cac1b..2a43a3143 100644 --- a/ietf/doc/views_doc.py +++ b/ietf/doc/views_doc.py @@ -571,7 +571,7 @@ def document_main(request, name, rev=None): raise Http404 -def get_email_aliases(name): +def get_draft_email_aliases(name): if name: pattern = re.compile('^expand-(%s)(\..*?)?@.*? +(.*)$'%name) else: @@ -589,7 +589,7 @@ def document_email(request,name): doc = get_object_or_404(Document, docalias__name=name) top = render_document_top(request, doc, "email", name) - aliases = get_email_aliases(name) if doc.type_id=='draft' else None + aliases = get_draft_email_aliases(name) if doc.type_id=='draft' else None expansions = gather_relevant_expansions(doc=doc) @@ -1017,7 +1017,7 @@ def email_aliases(request,name=''): # document-specific pages if not request.user.is_authenticated(): return redirect('%s?next=%s' % (settings.LOGIN_URL, request.path)) - aliases = get_email_aliases(name) + aliases = get_draft_email_aliases(name) return render(request,'doc/email_aliases.html',{'aliases':aliases,'ietf_domain':settings.IETF_DOMAIN,'doc':doc}) diff --git a/ietf/group/info.py b/ietf/group/info.py index 2b39f4cdc..60faac760 100644 --- a/ietf/group/info.py +++ b/ietf/group/info.py @@ -482,7 +482,7 @@ def group_about(request, acronym, group_type=None): "can_manage": can_manage, })) -def get_email_aliases(acronym, group_type): +def get_group_email_aliases(acronym, group_type): if acronym: pattern = re.compile('expand-(%s)(-\w+)@.*? +(.*)$'%acronym) else: @@ -500,7 +500,7 @@ def get_email_aliases(acronym, group_type): def email(request, acronym, group_type=None): group = get_group_or_404(acronym, group_type) - aliases = get_email_aliases(acronym, group_type) + aliases = get_group_email_aliases(acronym, group_type) expansions = gather_relevant_expansions(group=group) return render(request, 'group/email.html', @@ -710,7 +710,7 @@ def email_aliases(request, acronym=None, group_type=None): if not request.user.is_authenticated(): return redirect('%s?next=%s' % (settings.LOGIN_URL, request.path)) - aliases = get_email_aliases(acronym, group_type) + aliases = get_group_email_aliases(acronym, group_type) return render(request,'group/email_aliases.html',{'aliases':aliases,'ietf_domain':settings.IETF_DOMAIN,'group':group})