From ab825512b9fee14431d8bc2b15712d0eb7a9ff6d Mon Sep 17 00:00:00 2001 From: gaba Date: Wed, 4 Jan 2017 16:46:19 -0300 Subject: [PATCH 1/2] Adding missing translation. Not sure how to translate streams. --- client/coral-admin/src/translations.json | 1 + 1 file changed, 1 insertion(+) diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json index 3397a521b..4142c109f 100644 --- a/client/coral-admin/src/translations.json +++ b/client/coral-admin/src/translations.json @@ -146,6 +146,7 @@ "moderate": "Moderar", "configure": "Configurar", "community": "Comunidad", + "streams": "Streams", "closed-comments-desc": "Escribe un mensaje para cuando los comentarios se encuentran cerrados", "closed-comments-label": "Escribe un mensaje...", "never": "Nunca", From ac6fba2286a6a7c658d726e6eb04c527776bf009 Mon Sep 17 00:00:00 2001 From: gaba Date: Thu, 5 Jan 2017 15:34:27 -0300 Subject: [PATCH 2/2] Clean user state on logout. Allow flagging only if not banned. --- client/coral-framework/constants/user.js | 1 + client/coral-framework/reducers/user.js | 2 ++ client/coral-plugin-flags/FlagButton.js | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/client/coral-framework/constants/user.js b/client/coral-framework/constants/user.js index 6e09726d3..9c6f508fe 100644 --- a/client/coral-framework/constants/user.js +++ b/client/coral-framework/constants/user.js @@ -4,3 +4,4 @@ export const SAVE_BIO_FAILURE = 'SAVE_BIO_FAILURE'; export const COMMENTS_BY_USER_REQUEST = 'COMMENTS_BY_USER_REQUEST'; export const COMMENTS_BY_USER_SUCCESS = 'COMMENTS_BY_USER_SUCCESS'; export const COMMENTS_BY_USER_FAILURE = 'COMMENTS_BY_USER_FAILURE'; +export const LOGOUT_SUCCESS = 'LOGOUT_SUCCESS'; diff --git a/client/coral-framework/reducers/user.js b/client/coral-framework/reducers/user.js index bd5f78e87..a6f980fd8 100644 --- a/client/coral-framework/reducers/user.js +++ b/client/coral-framework/reducers/user.js @@ -37,6 +37,8 @@ export default function user (state = initialState, action) { return state.set('myComments', action.comments); case assetActions.MULTIPLE_ASSETS_SUCCESS: return state.set('myAssets', action.assets); + case actions.LOGOUT_SUCCESS: + return initialState; default : return state; } diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js index 097ac9d5b..23943318d 100644 --- a/client/coral-plugin-flags/FlagButton.js +++ b/client/coral-plugin-flags/FlagButton.js @@ -102,7 +102,7 @@ class FlagButton extends Component { const popupMenu = getPopupMenu[this.state.step](this.state.itemType); return
-