From 2aa542cdbb7ee546b61d4120c0991488a622d44f Mon Sep 17 00:00:00 2001
From: Bereczki Sandor <bsandor453@gmail.com>
Date: Wed, 30 Jan 2019 16:53:00 +0100
Subject: [PATCH] Solution without File fixed

You can now send solution without a file, the admin will see a 'No file' tag.
---
 src/actions/homework.js                     |  2 --
 src/components/forms/CorrectSolutionForm.js | 10 +++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/actions/homework.js b/src/actions/homework.js
index ccd4c8b..1ac7aed 100644
--- a/src/actions/homework.js
+++ b/src/actions/homework.js
@@ -151,7 +151,6 @@ export const addSolution = ({
         note,
       });
       if (response.data.id) {
-        console.log(response.data.id);
         dispatch({
           type: ADD_SOLUTION,
           payload: response.data,
@@ -159,7 +158,6 @@ export const addSolution = ({
       }
 
       const solution = response.data.id;
-      console.log(solution);
 
       const formData = new FormData();
       formData.append('name', name);
diff --git a/src/components/forms/CorrectSolutionForm.js b/src/components/forms/CorrectSolutionForm.js
index 019fb59..d933300 100644
--- a/src/components/forms/CorrectSolutionForm.js
+++ b/src/components/forms/CorrectSolutionForm.js
@@ -23,10 +23,14 @@ class CorrectSolutionForm extends Component {
       document.uploaded_by_name === studentFullName);
     const relevantDocument = relevantDocuments[relevantDocuments.length - 1];
     let fileLink;
-    if (relevantDocument !== undefined || relevantDocument !== null) {
+    if (relevantDocument !== undefined && relevantDocument !== null &&
+    relevantDocument.file !== undefined && relevantDocument.file !== null) {
       fileLink = `/media${relevantDocument.file.split('media')[1]}`;
+    } else {
+      fileLink = null;
     }
 
+
     const { note } = this.props.correction;
     return (
       <Modal
@@ -47,9 +51,9 @@ class CorrectSolutionForm extends Component {
         </Modal.Header>
         <Modal.Content>
           <Header as='h5'>A megoldĂĄs leĂ­rĂĄsa:</Header>
-          {relevantDocument === undefined ? 'Nincs leĂ­rĂĄs.' : relevantDocument.description.split('\n')}
+          {fileLink === null ? 'Nincs leĂ­rĂĄs.' : relevantDocument.description.split('\n')}
           <Header as='h5'>A beadott dokumentum:</Header>
-          {relevantDocument === undefined ?
+          {fileLink === null ?
             <p>Nincs fĂĄjl.</p> :
             <a href={fileLink}>FĂĄjl letĂśltĂŠse</a>}
           <Header as='h5'>ElfogadĂĄs/ElutasĂ­tĂĄs:</Header>
-- 
GitLab