From 93e850ba3fd42e0aa963d1b901e2a80ab01ee80a Mon Sep 17 00:00:00 2001 From: Olly Dutton Date: Tue, 13 Mar 2018 12:16:59 +1100 Subject: [PATCH 1/6] Update UserDetailComment.js Ternary to display asset url if there's no asset title in admin comments --- client/coral-admin/src/components/UserDetailComment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-admin/src/components/UserDetailComment.js b/client/coral-admin/src/components/UserDetailComment.js index ba185a9df..931b4bdeb 100644 --- a/client/coral-admin/src/components/UserDetailComment.js +++ b/client/coral-admin/src/components/UserDetailComment.js @@ -76,7 +76,7 @@ class UserDetailComment extends React.Component {
- Story: {comment.asset.title} + Story: {comment.asset.title ? comment.asset.title : comment.asset.url} { {t('modqueue.moderate')} From bfb9ea1eea8823ec310ee218db4c4136739309c5 Mon Sep 17 00:00:00 2001 From: Olly Dutton Date: Tue, 13 Mar 2018 12:18:21 +1100 Subject: [PATCH 2/6] Update Comment.js Ternary to display asset url if there's no asset title in admin comments --- client/coral-admin/src/routes/Moderation/components/Comment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js index f865908b2..85e68e25a 100644 --- a/client/coral-admin/src/routes/Moderation/components/Comment.js +++ b/client/coral-admin/src/routes/Moderation/components/Comment.js @@ -122,7 +122,7 @@ class Comment extends React.Component {
- Story: {comment.asset.title} + Story: {comment.asset.title ? comment.asset.title : comment.asset.url} {!currentAsset && ( {t('modqueue.moderate')} From 8e0c53ef3b76bff2af2232a42722d9a461ef01b9 Mon Sep 17 00:00:00 2001 From: Olly Dutton Date: Tue, 13 Mar 2018 15:33:46 +1100 Subject: [PATCH 3/6] Update UserDetailComment.js fix linting error --- client/coral-admin/src/components/UserDetailComment.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/coral-admin/src/components/UserDetailComment.js b/client/coral-admin/src/components/UserDetailComment.js index 931b4bdeb..2d39a7853 100644 --- a/client/coral-admin/src/components/UserDetailComment.js +++ b/client/coral-admin/src/components/UserDetailComment.js @@ -76,7 +76,8 @@ class UserDetailComment extends React.Component {
- Story: {comment.asset.title ? comment.asset.title : comment.asset.url} + Story:{' '} + {comment.asset.title ? comment.asset.title : comment.asset.url} { {t('modqueue.moderate')} From 6efda40e295fd0d0c8d3f40c99549057c4e64245 Mon Sep 17 00:00:00 2001 From: Olly Dutton Date: Tue, 13 Mar 2018 15:34:28 +1100 Subject: [PATCH 4/6] Update Comment.js fix linting error --- client/coral-admin/src/routes/Moderation/components/Comment.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js index 85e68e25a..f3378a234 100644 --- a/client/coral-admin/src/routes/Moderation/components/Comment.js +++ b/client/coral-admin/src/routes/Moderation/components/Comment.js @@ -122,7 +122,8 @@ class Comment extends React.Component {
- Story: {comment.asset.title ? comment.asset.title : comment.asset.url} + Story:{' '} + {comment.asset.title ? comment.asset.title : comment.asset.url} {!currentAsset && ( {t('modqueue.moderate')} From bb1b265cae1bd8383c8f989a80e285c8689b5779 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 14 Mar 2018 15:12:38 -0600 Subject: [PATCH 5/6] lint --- client/coral-admin/src/components/UserDetailComment.js | 2 +- client/coral-admin/src/routes/Moderation/components/Comment.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/coral-admin/src/components/UserDetailComment.js b/client/coral-admin/src/components/UserDetailComment.js index 2d39a7853..a14aecf9f 100644 --- a/client/coral-admin/src/components/UserDetailComment.js +++ b/client/coral-admin/src/components/UserDetailComment.js @@ -76,7 +76,7 @@ class UserDetailComment extends React.Component {
- Story:{' '} + Story:{' '} {comment.asset.title ? comment.asset.title : comment.asset.url} { diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js index f3378a234..637772c0f 100644 --- a/client/coral-admin/src/routes/Moderation/components/Comment.js +++ b/client/coral-admin/src/routes/Moderation/components/Comment.js @@ -122,7 +122,7 @@ class Comment extends React.Component {
- Story:{' '} + Story:{' '} {comment.asset.title ? comment.asset.title : comment.asset.url} {!currentAsset && ( From 8c7e8080c304a8a1679b21d95adb06ebc6e61601 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 14 Mar 2018 15:13:44 -0600 Subject: [PATCH 6/6] added translations --- client/coral-admin/src/components/UserDetailComment.js | 3 ++- client/coral-admin/src/routes/Moderation/components/Comment.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/client/coral-admin/src/components/UserDetailComment.js b/client/coral-admin/src/components/UserDetailComment.js index a14aecf9f..206242058 100644 --- a/client/coral-admin/src/components/UserDetailComment.js +++ b/client/coral-admin/src/components/UserDetailComment.js @@ -76,7 +76,7 @@ class UserDetailComment extends React.Component {
- Story:{' '} + {t('common.story')}:{' '} {comment.asset.title ? comment.asset.title : comment.asset.url} { @@ -110,6 +110,7 @@ class UserDetailComment extends React.Component {
+ {/* TODO: translate string */} Contains Link diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js index 637772c0f..efdcfbd79 100644 --- a/client/coral-admin/src/routes/Moderation/components/Comment.js +++ b/client/coral-admin/src/routes/Moderation/components/Comment.js @@ -122,7 +122,7 @@ class Comment extends React.Component {
- Story:{' '} + {t('common.story')}:{' '} {comment.asset.title ? comment.asset.title : comment.asset.url} {!currentAsset && ( @@ -157,6 +157,7 @@ class Comment extends React.Component {
+ {/* TODO: translate string */} Contains Link