Skip to content
Snippets Groups Projects
Commit 932b2cdf authored by Bereczki Sandor's avatar Bereczki Sandor
Browse files

Homework permission fix + empty description fix

parent 7354b866
No related branches found
No related tags found
No related merge requests found
......@@ -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;
}
......
......@@ -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'>
......
......@@ -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> :
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment