diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-06-30 01:07:00 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-06-30 01:07:00 +0500 |
| commit | 7f8c2a9c83477b886b365d3e6d0d040e7314dc18 (patch) | |
| tree | e6a541a8275f37b7f95342ae31eba68de8e2f34d /api | |
| parent | fce4ad42cbbcd890c9bc8d5fc4963eec7b4867dc (diff) | |
| parent | e6b5bdef82b23d61286ff455ee245a26a40d195f (diff) | |
| download | chat-7f8c2a9c83477b886b365d3e6d0d040e7314dc18.tar.gz chat-7f8c2a9c83477b886b365d3e6d0d040e7314dc18.tar.bz2 chat-7f8c2a9c83477b886b365d3e6d0d040e7314dc18.zip | |
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'api')
| -rw-r--r-- | api/team.go | 9 | ||||
| -rw-r--r-- | api/templates/invite_body.html | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/api/team.go b/api/team.go index 775bc29ae..24b7ec9e1 100644 --- a/api/team.go +++ b/api/team.go @@ -488,12 +488,21 @@ func InviteMembers(team *model.Team, user *model.User, invites []string) { } else { sender = user.FullName } + + senderRole := "" + if strings.Contains(user.Roles, model.ROLE_ADMIN) || strings.Contains(user.Roles, model.ROLE_SYSTEM_ADMIN) { + senderRole = "administrator" + } else { + senderRole = "member" + } + subjectPage := NewServerTemplatePage("invite_subject", teamUrl) subjectPage.Props["SenderName"] = sender subjectPage.Props["TeamName"] = team.Name bodyPage := NewServerTemplatePage("invite_body", teamUrl) bodyPage.Props["TeamName"] = team.Name bodyPage.Props["SenderName"] = sender + bodyPage.Props["SenderStatus"] = senderRole bodyPage.Props["Email"] = invite diff --git a/api/templates/invite_body.html b/api/templates/invite_body.html index 06f48759c..8be2ac0df 100644 --- a/api/templates/invite_body.html +++ b/api/templates/invite_body.html @@ -18,7 +18,7 @@ <tr> <td style="border-bottom: 1px solid #ddd; padding: 0 0 20px;"> <h2 style="font-weight: normal; margin-top: 10px;">You've been invited</h2> - <p>{{.Props.TeamName}} started using {{.SiteName}}.<br> The team administrator <strong>{{.Props.SenderName}}</strong>, has invited you to join <strong>{{.Props.TeamName}}</strong>.</p> + <p>{{.Props.TeamName}} started using {{.SiteName}}.<br> The team {{.Props.SenderStatus}} <strong>{{.Props.SenderName}}</strong>, has invited you to join <strong>{{.Props.TeamName}}</strong>.</p> <p style="margin: 20px 0 15px"> <a href="{{.Props.Link}}" style="background: #2389D7; border-radius: 3px; color: #fff; border: none; outline: none; min-width: 200px; padding: 15px 25px; font-size: 14px; font-family: inherit; cursor: pointer; -webkit-appearance: none;text-decoration: none;">Join Team</a> </p> |