diff --git a/src/actions/auth.js b/src/actions/auth.js index ac0e9e51764333deae7eacf7741ad0510b9bc3f9..fbe16645ab94567d0ae6261d85d84ff761c733c1 100644 --- a/src/actions/auth.js +++ b/src/actions/auth.js @@ -20,16 +20,16 @@ export const getUserData = () => ( let permission; switch (role) { case 'Applicant': - permission=1; + permission = 1; break; case 'Student': - permission=2; + permission = 2; break; case 'Staff': - permission=3; + permission = 3; break; default: - permission=0; + permission = 0; break; } diff --git a/src/components/Header.js b/src/components/Header.js index b980d1ab2db32e9f39d6b4438b540807e7a2569c..c27945d8c282f067cf1535d76aa49b54437864eb 100644 --- a/src/components/Header.js +++ b/src/components/Header.js @@ -53,9 +53,9 @@ const menuItems = [ text: 'HĂĄzi feladatok', to: '/homework', prefix: '', - permissionLevel: 1, + permissionLevel: 2, }, -] +]; const FixedMenu = ({ user }) => ( <Menu fixed='top' size='large' pointing> @@ -64,7 +64,7 @@ const FixedMenu = ({ user }) => ( (user.permission >= item.permissionLevel || (item.permissionLevel === 0) ? - <Menu.Item key={i} as={Link} to={item.to}>{item.text}</Menu.Item> + <Menu.Item key={i} as={Link} to={item.to}>{item.text}</Menu.Item> : null))} @@ -105,7 +105,6 @@ class Header extends Component { } - render() { const { visible } = this.state; @@ -124,8 +123,8 @@ class Header extends Component { {menuItems.map((item, i) => (this.props.user.permission >= item.permissionLevel || (item.permissionLevel === 0) ? - <Menu.Item key={i} as={Link} to={item.to}>{item.prefix}{item.text}</Menu.Item> - : + <Menu.Item key={i} as={Link} to={item.to}>{item.prefix}{item.text}</Menu.Item> + : null))} <Menu.Item position='right'> diff --git a/src/components/forms/CorrectSolutionForm.js b/src/components/forms/CorrectSolutionForm.js index 341c4a33f63d41c2fa826089ace4174bfa9a5756..97977ecbf23aaa054ec5a15a93bfe97d8e105a07 100644 --- a/src/components/forms/CorrectSolutionForm.js +++ b/src/components/forms/CorrectSolutionForm.js @@ -51,10 +51,11 @@ class CorrectSolutionForm extends Component { </Modal.Header> <Modal.Content> <Header as='h5'>A megoldĂĄs leĂrĂĄsa:</Header> - {(relevantDocument === undefined || relevantDocument === null) - && fileLink != null - ? 'Nincs leĂrĂĄs.' - : relevantDocument.description.split('\n')} + { (relevantDocument !== undefined && relevantDocument !== null && + relevantDocument.description !== undefined && relevantDocument.description !== null + && relevantDocument.description !== '') + ? relevantDocument.description.split('\n') + : <p>Nincs leĂrĂĄs.</p>} <Header as='h5'>A beadott dokumentum:</Header> {fileLink === null ? <p>Nincs fĂĄjl.</p> :