From 71d6b9099333632dfc5c5ef389e030617542a06f Mon Sep 17 00:00:00 2001 From: gaba Date: Thu, 8 Dec 2016 18:29:15 -1000 Subject: [PATCH] SMall changes for PR. --- client/coral-admin/src/components/BanUserDialog.js | 6 ++---- client/coral-admin/src/components/Comment.js | 2 -- client/coral-admin/src/reducers/users.js | 2 +- routes/api/user/index.js | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/client/coral-admin/src/components/BanUserDialog.js b/client/coral-admin/src/components/BanUserDialog.js index aa9df7780..9c166cc39 100644 --- a/client/coral-admin/src/components/BanUserDialog.js +++ b/client/coral-admin/src/components/BanUserDialog.js @@ -9,10 +9,8 @@ import I18n from 'coral-framework/modules/i18n/i18n'; import translations from '../translations'; const lang = new I18n(translations); -const BanUserDialog = ({open, handleClose, onClickBanUser, user}) => { - const userName = (typeof user === 'undefined') ? '' : user['userName']; - const userId = (typeof user === 'undefined') ? '' : user['userId']; - const commentId = (typeof user === 'undefined') ? '' : user['commentId']; +const BanUserDialog = ({open, handleClose, onClickBanUser, user = {}}) => { + const {userName = '', userId = '', commentId = ''} = user; return ( handleClose()} onCancel={() => handleClose()} title={lang.t('bandialog.ban_user')}> diff --git a/client/coral-admin/src/components/Comment.js b/client/coral-admin/src/components/Comment.js index a13372dbe..380a001c8 100644 --- a/client/coral-admin/src/components/Comment.js +++ b/client/coral-admin/src/components/Comment.js @@ -50,8 +50,6 @@ export default props => { ); }; -//return props.author.get('status') === 'banned' ? 'disabled' : 'raised'; - // Get the button of the action performed over a comment if any const getActionButton = (action, i, props) => { const status = props.comment.get('status'); diff --git a/client/coral-admin/src/reducers/users.js b/client/coral-admin/src/reducers/users.js index 09489ffef..ef589c155 100644 --- a/client/coral-admin/src/reducers/users.js +++ b/client/coral-admin/src/reducers/users.js @@ -2,7 +2,7 @@ import {Map, List, fromJS} from 'immutable'; const initialState = Map({ byId: Map(), - ids: List(), + ids: List() }); export default (state = initialState, action) => { diff --git a/routes/api/user/index.js b/routes/api/user/index.js index 4f669d907..ca84af361 100644 --- a/routes/api/user/index.js +++ b/routes/api/user/index.js @@ -51,7 +51,7 @@ router.post('/:user_id/status', (req, res, next) => { User .setStatus(req.params.user_id, req.body.status, req.body.comment_id) .then(status => { - res.send(status); + res.json(status); }) .catch(next); });