Look at intended_std_level instead of looking at the indefinite

article when determining document/protocol action status, also avoid
putting stuff in a list that has been taken directly by reference from
the settings
 - Legacy-Id: 3963
This commit is contained in:
Ole Laursen 2012-02-24 16:55:53 +00:00
parent f6f7e4b321
commit 708c3a4df9

View file

@ -297,13 +297,14 @@ def generate_approval_mailREDESIGN(request, doc):
def generate_approval_mail_approved(request, doc):
doc.full_status = full_intended_status(doc.intended_std_level)
status = doc.full_status.replace("a ", "").replace("an ", "")
if "an " in status:
action_type = "Document"
else:
if doc.intended_std_level_id in ("std", "ds", "ps", "bcp"):
action_type = "Protocol"
cc = settings.DOC_APPROVAL_EMAIL_CC
else:
action_type = "Document"
cc = []
cc.extend(settings.DOC_APPROVAL_EMAIL_CC)
# the second check catches some area working groups (like
# Transport Area Working Group)