From cb1329ba1d6bc59067b9e1a24cb96de2660ea71c Mon Sep 17 00:00:00 2001 From: barlas <yannisbarlas@gmail.com> Date: Fri, 16 Dec 2016 15:49:10 +0200 Subject: [PATCH] admin can unlock chapters --- app/components/BookBuilder/BookBuilder.jsx | 1 + .../BookBuilder/Chapter/EditingNotification.jsx | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/components/BookBuilder/BookBuilder.jsx b/app/components/BookBuilder/BookBuilder.jsx index dfed3ca..16a61fe 100644 --- a/app/components/BookBuilder/BookBuilder.jsx +++ b/app/components/BookBuilder/BookBuilder.jsx @@ -89,6 +89,7 @@ export class BookBuilder extends React.Component { }) let roles = [] + if (user.admin) roles.push('admin') function addRole (role) { roles = _.union(roles, [role]) diff --git a/app/components/BookBuilder/Chapter/EditingNotification.jsx b/app/components/BookBuilder/Chapter/EditingNotification.jsx index 40986c8..16e771a 100644 --- a/app/components/BookBuilder/Chapter/EditingNotification.jsx +++ b/app/components/BookBuilder/Chapter/EditingNotification.jsx @@ -57,13 +57,14 @@ class EditingNotification extends React.Component { const { chapter, modalContainer, update } = this.props const { showModal } = this.state const username = chapter.lock.editor.username + const isAdmin = this.isAdmin() let message = username + ' is editing' let hoverTitle, unlockModal let toggle = noop - if (this.isAdmin()) { - toggle = this.toggle() + if (isAdmin) { + toggle = this.toggleModal unlockModal = ( <UnlockModal @@ -81,10 +82,15 @@ class EditingNotification extends React.Component { } } + const inlineStyle = { + 'cursor': isAdmin ? 'pointer' : 'default' + } + return ( <a id='bb-unlock' className={styles.lEditing} onClick={toggle} + style={inlineStyle} title={hoverTitle} > <i -- GitLab