From f1a0a01af1b04b90a2da8875ad3352e39751ccfd Mon Sep 17 00:00:00 2001 From: barlas <yannisbarlas@gmail.com> Date: Fri, 16 Dec 2016 16:24:41 +0200 Subject: [PATCH] show timestamp for admin unlock && fix redux logger option --- app/components/BookBuilder/BookBuilder.jsx | 9 --------- app/components/SimpleEditor/SimpleEditorWrapper.jsx | 3 ++- webpack/webpack.dev.config.js | 3 ++- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/app/components/BookBuilder/BookBuilder.jsx b/app/components/BookBuilder/BookBuilder.jsx index 16a61fe..f6d5841 100644 --- a/app/components/BookBuilder/BookBuilder.jsx +++ b/app/components/BookBuilder/BookBuilder.jsx @@ -72,15 +72,6 @@ export class BookBuilder extends React.Component { this.setState({ showTeamManager: !this.state.showTeamManager }) } - // _validate (fn) { - // const self = this - // return function wrap (...args) { - // if (self.enableActions) { - // return fn(...args) - // } - // } - // } - _getRoles () { const { user, book } = this.props diff --git a/app/components/SimpleEditor/SimpleEditorWrapper.jsx b/app/components/SimpleEditor/SimpleEditorWrapper.jsx index 08233a0..550324c 100644 --- a/app/components/SimpleEditor/SimpleEditorWrapper.jsx +++ b/app/components/SimpleEditor/SimpleEditorWrapper.jsx @@ -59,7 +59,8 @@ export class SimpleEditorWrapper extends React.Component { fragment.lock = { editor: { username: user.username - } + }, + timestamp: new Date() } updateFragment(book, fragment) } diff --git a/webpack/webpack.dev.config.js b/webpack/webpack.dev.config.js index 842a8b5..f187ce0 100644 --- a/webpack/webpack.dev.config.js +++ b/webpack/webpack.dev.config.js @@ -42,7 +42,8 @@ module.exports = [ new webpack.NoErrorsPlugin(), new webpack.DefinePlugin({ 'process.env': { - 'NODE_ENV': JSON.stringify('dev') + 'NODE_ENV': JSON.stringify('dev'), + 'REDUXLOG_OFF': process.env.REDUXLOG_OFF } }), new webpack.ProvidePlugin({ -- GitLab