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

Renamed the two get_email_aliases functions to have distinct names.

Browse source 
- Legacy-Id: 10201
This commit is contained in:
Henrik Levkowetz 2015-10-13 18:12:59 +00:00
parent a6b5453e69
commit caa56e97a4
2 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_doc.py
View file

@ -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})

6
ietf/group/info.py
View file

@ -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})