From dc82db6eda7e7441f8c5078c55b638f788f6b65b Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Fri, 16 Feb 2018 14:38:57 -0700 Subject: [PATCH 1/2] fixed template bugs --- views/admin/confirm-email.ejs | 2 +- views/admin/docs.ejs | 2 +- views/admin/password-reset.ejs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/views/admin/confirm-email.ejs b/views/admin/confirm-email.ejs index e63910734..4e59de1d8 100644 --- a/views/admin/confirm-email.ejs +++ b/views/admin/confirm-email.ejs @@ -5,7 +5,7 @@ Email Verification - <%- include partials/head %> + <%- include ../partials/head %>
diff --git a/views/admin/docs.ejs b/views/admin/docs.ejs index bfc476ee3..7086404ae 100644 --- a/views/admin/docs.ejs +++ b/views/admin/docs.ejs @@ -24,7 +24,7 @@ font-weight: bold; } - <%- include partials/head %> + <%- include ../partials/head %>
diff --git a/views/admin/password-reset.ejs b/views/admin/password-reset.ejs index f66db491a..75770a15e 100644 --- a/views/admin/password-reset.ejs +++ b/views/admin/password-reset.ejs @@ -5,7 +5,7 @@ Password Reset - <%- include partials/head %> + <%- include ../partials/head %>
From c2aa2077f470b396339eaef5b0f01b843f552e1a Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Fri, 16 Feb 2018 16:14:49 -0700 Subject: [PATCH 2/2] Show suspension status on button --- client/coral-framework/utils/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-framework/utils/user.js b/client/coral-framework/utils/user.js index 93dcd4db9..f50fca335 100644 --- a/client/coral-framework/utils/user.js +++ b/client/coral-framework/utils/user.js @@ -21,7 +21,7 @@ export const getReliability = reliabilityValue => { */ export const isSuspended = user => { - const suspensionUntil = get(user, 'status.suspension.until'); + const suspensionUntil = get(user, 'state.status.suspension.until'); return user && suspensionUntil && new Date(suspensionUntil) > new Date(); };