From 11b38f7ea0780f60180fd01bed70659dcdf9f410 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Thu, 11 Jan 2018 13:55:09 +0100 Subject: [PATCH 1/4] Fix no status history error --- client/coral-admin/src/containers/UserDetailComment.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/coral-admin/src/containers/UserDetailComment.js b/client/coral-admin/src/containers/UserDetailComment.js index fe95f4ae4..479d28dc7 100644 --- a/client/coral-admin/src/containers/UserDetailComment.js +++ b/client/coral-admin/src/containers/UserDetailComment.js @@ -35,6 +35,9 @@ export default withFragments({ editing { edited } + status_history { + type + } ...${getDefinitionName(CommentLabels.fragments.comment)} ...${getDefinitionName(CommentDetails.fragments.comment)} } From 1337873adf6b6474eaadaf2ea7f007373afcaa27 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Thu, 11 Jan 2018 16:05:02 +0100 Subject: [PATCH 2/4] Remove unwanted scroll in configure --- .../coral-admin/src/routes/Configure/components/Configure.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-admin/src/routes/Configure/components/Configure.css b/client/coral-admin/src/routes/Configure/components/Configure.css index 82760acff..f4bcb8b01 100644 --- a/client/coral-admin/src/routes/Configure/components/Configure.css +++ b/client/coral-admin/src/routes/Configure/components/Configure.css @@ -20,7 +20,7 @@ .mainContent { width: calc(100% - 300px); - padding: 10px 14px 80px 14px; + padding: 10px 14px 120px 14px; box-sizing: border-box; max-width: 718px; } From 210b0ab907d33a5b050e6339acf5af28b2da5119 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Thu, 11 Jan 2018 16:05:20 +0100 Subject: [PATCH 3/4] Only show scrollbars when necessary --- client/coral-admin/src/components/ToastContainer.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-admin/src/components/ToastContainer.css b/client/coral-admin/src/components/ToastContainer.css index 2fcbd7f7d..100f97f89 100644 --- a/client/coral-admin/src/components/ToastContainer.css +++ b/client/coral-admin/src/components/ToastContainer.css @@ -207,7 +207,7 @@ .toastify__body { color: white; - overflow-x: scroll; + overflow-x: auto; font-size: 15px; font-weight: 400; } From 2269c91244ee6ff8b46ab240df11af32ca8ae262 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Thu, 11 Jan 2018 16:54:54 +0100 Subject: [PATCH 4/4] Restore shortcut functionality --- .../coral-admin/src/routes/Moderation/components/Moderation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js index e14df7a89..a7a7d16ac 100644 --- a/client/coral-admin/src/routes/Moderation/components/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js @@ -176,7 +176,7 @@ class Moderation extends Component { hasNextPage={comments.hasNextPage} activeTab={activeTab} singleView={moderation.singleView} - selectedCommentId={this.state.selectedCommentId} + selectedCommentId={moderation.selectedCommentId} acceptComment={props.acceptComment} rejectComment={props.rejectComment} loadMore={this.loadMore}