Commit 95e8c912 authored by Martin Lowe's avatar Martin Lowe 🇨🇦
Browse files

Merge branch 'master' into 'dev'

Merge master into dev

See merge request !466
parents 6fa57531 c8691e31
Pipeline #1755 passed with stage
in 0 seconds
......@@ -111,7 +111,7 @@ public class DefaultMailerService implements MailerService {
renderHTMLPDF(
membershipTemplateWeb
.data(EMAIL_DATA_VAR, data, CONTEXT_VAR,
new MailerDataContext(applicationGroup, LocalDateTime.now(), false, true))
new MailerDataContext(applicationGroup, LocalDateTime.now(), true, false))
.render()),
"application/pdf");
mailer.send(m);
......@@ -165,7 +165,7 @@ public class DefaultMailerService implements MailerService {
Mail m = Mail.withHtml(recipient, subject,
membershipTemplateWeb
.data(EMAIL_DATA_VAR, data, CONTEXT_VAR,
new MailerDataContext(applicationGroup, LocalDateTime.now(), true, includePreamble))
new MailerDataContext(applicationGroup, LocalDateTime.now(), false, includePreamble))
.render());
m.setText(
membershipTemplate
......
......@@ -65,8 +65,7 @@ export default function MainPortal({
const classes = useStyles();
const [mobileOpen, setMobileOpen] = useState(false);
const { gotCSRF, currentUser } = useContext(GlobalContext);
// The loggedIn will only be true when the user is logged in and he/she is at least linked to 1 org
const loggedIn = currentUser !== null && currentUser.relation.length > 0;
const loggedIn = currentUser !== null;
const handleDrawerToggle = () => {
setMobileOpen(!mobileOpen);
};
......@@ -83,7 +82,7 @@ export default function MainPortal({
return (
<>
{loggedIn && (
{currentUser && (
<>
<AppTopBar handleDrawerToggle={handleDrawerToggle} />
<LeftNavBar mobileOpen={mobileOpen} handleDrawerToggle={handleDrawerToggle} />
......@@ -114,7 +113,7 @@ export default function MainPortal({
<Redirect to="/portal/dashboard" />
</Route>
</Switch>
<div className={loggedIn ? '' : classes.loginFooter}>
<div className={classes.loginFooter}>
<PortalFooter />
</div>
</>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment