From 932b2cdf2cdf5e78c9e9226b26cfb67d489f8bbf Mon Sep 17 00:00:00 2001
From: Bereczki Sandor <bsandor453@gmail.com>
Date: Thu, 31 Jan 2019 16:22:42 +0100
Subject: [PATCH] Homework permission fix + empty description fix

---
 src/actions/auth.js                         |  8 ++++----
 src/components/Header.js                    | 11 +++++------
 src/components/forms/CorrectSolutionForm.js |  9 +++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/actions/auth.js b/src/actions/auth.js
index ac0e9e5..fbe1664 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 b980d1a..c27945d 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 341c4a3..97977ec 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> :
-- 
GitLab