From 3868e8feaeb0ab7aa9cbdac46c0f80bee68b891a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 9 Sep 2019 17:04:40 +0200
Subject: [PATCH] fix(file-upload): fix inverted logic for when upload is
 required

---
 src/Handler/Submission.hs | 2 +-
 src/Handler/Utils/Form.hs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index d2d5a6138..fe52740d4 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -124,7 +124,7 @@ submissionUserInvitationConfig = InvitationConfig{..}
 
 makeSubmissionForm :: CourseId -> Maybe SubmissionId -> UploadMode -> SheetGroup -> Bool -> Set (Either UserEmail UserId) -> Form (Maybe (Source Handler File), Set (Either UserEmail UserId))
 makeSubmissionForm cid msmid uploadMode grouping isLecturer prefillUsers = identifyForm FIDsubmission . renderAForm FormStandard $ (,)
-  <$> fileUploadForm (is _Just msmid) (fslI . bool MsgSubmissionFile MsgSubmissionArchive) uploadMode
+  <$> fileUploadForm (not isLecturer && is _Nothing msmid) (fslI . bool MsgSubmissionFile MsgSubmissionArchive) uploadMode
   <*> wFormToAForm submittorsForm
   where
     miCell' :: Markup -> Either UserEmail UserId -> Widget
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 7dc44c04a..1571b13af 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -701,7 +701,7 @@ fileUploadForm isReq mkFs = \case
   NoUpload
     -> pure Nothing
   UploadAny{..}
-    -> (bool (\f fs _ -> Just <$> areq f fs Nothing) aopt isReq) (zipFileField unpackZips extensionRestriction) (mkFs unpackZips) Nothing
+    -> bool aopt (\f fs _ -> Just <$> areq f fs Nothing) isReq (zipFileField unpackZips extensionRestriction) (mkFs unpackZips) Nothing
   UploadSpecific{..}
     -> mergeFileSources <$> sequenceA (map specificFileForm . Set.toList $ toNullable specificFiles)
   where