Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Console - enhance email template by adding orgs to new users #2724

Merged
merged 2 commits into from
Sep 27, 2019

Conversation

RemiDesgrange
Copy link
Contributor

@RemiDesgrange RemiDesgrange commented Sep 27, 2019

Add org of the user when new user register (see also datadir). Having Org in your template is nor mandatory. If it's present it will be populated accordingly

@RemiDesgrange RemiDesgrange changed the base branch from 19.04 to master September 27, 2019 06:59
@RemiDesgrange RemiDesgrange changed the title Gshdf 228 fix email template Enhance email template by adding orgs to new users Sep 27, 2019
@fvanderbiest fvanderbiest added this to In progress in Geo2France via automation Sep 27, 2019
@fvanderbiest fvanderbiest changed the title Enhance email template by adding orgs to new users Console - enhance email template by adding orgs to new users Sep 27, 2019
Geo2France automation moved this from In progress to Needs review Sep 27, 2019
Copy link
Member

@fvanderbiest fvanderbiest left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM otherwise

@@ -150,6 +150,9 @@ public void sendNewAccountNotificationEmail(ServletContext servletContext, List<
email.set("name", userName);
email.set("uid", uid);
email.set("email", userEmail);
if (userOrg == null) {
userOrg = "None";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather have an empty string here, since there is no email template i18n

@fvanderbiest fvanderbiest merged commit f298992 into master Sep 27, 2019
Geo2France automation moved this from Needs review to Done Sep 27, 2019
@fvanderbiest fvanderbiest deleted the gshdf-228-fix-email-template branch September 27, 2019 07:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Geo2France
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

2 participants