Small tweaks for adding a new application member:

- raise specific invitation type if invite not found in invitation domain classes
- more terse assignments of defaults in invitation service, smh
- terser margin expression for inline input fields
- sass formatting
- use translation for cancel link
- oxford comma for app team management permission explanation
- do not format environment roles with hyphens for role selection
- generalize some additional methods in the invitation domain base class
- use plain atst.models import path
This commit is contained in:
dandds
2019-04-30 14:49:53 -04:00
parent 5db4d9bab3
commit 4f304d747e
10 changed files with 23 additions and 30 deletions

View File

@@ -57,26 +57,18 @@ class Invitation:
if isinstance(member, PortfolioRole):
self.email_template = (
"emails/portfolio/invitation.txt"
if self.email_template is None
else self.email_template
self.email_template or "emails/portfolio/invitation.txt"
)
self.subject = (
"{} has invited you to a JEDI cloud portfolio"
if self.subject is None
else self.subject
self.subject or "{} has invited you to a JEDI cloud portfolio"
)
self.domain_class = PortfolioInvitations
elif isinstance(member, ApplicationRole):
self.email_template = (
"emails/application/invitation.txt"
if self.email_template is None
else self.email_template
self.email_template or "emails/application/invitation.txt"
)
self.subject = (
"{} has invited you to a JEDI cloud application"
if self.subject is None
else self.subject
self.subject or "{} has invited you to a JEDI cloud application"
)
self.domain_class = ApplicationInvitations