Revert "Allow overriding unpackZips-Checkbox"

This reverts commit 8e43a314d3.

src/Handler/Sheet.hs

@@ -83,7 +83,7 @@ makeSheetForm msId template = identForm FIDsheet $ \html -> do
       <*> aopt utcTimeField   (fsb "Sichtbar ab") (sfVisibleFrom  <$> template)
       <*> areq utcTimeField   (fsb "Abgabe ab")   (sfActiveFrom   <$> template)
       <*> areq utcTimeField   (fsb "Abgabefrist") (sfActiveTo     <$> template)
-      <*> aopt (multiFileField Nothing $ oldFileIds SheetExercise) (fsb "Aufgabenstellung") (sfSheetF <$> template)
+      <*> aopt (multiFileField $ oldFileIds SheetExercise) (fsb "Aufgabenstellung") (sfSheetF <$> template)
       <*> aopt utcTimeField   (fsb "Hinweis ab")  (sfHintFrom     <$> template)
       <*> fileAFormOpt        (fsb "Hinweis")
       <*> aopt utcTimeField   (fsb "Lösung ab")   (sfSolutionFrom <$> template)

src/Handler/Utils/Form.hs

@@ -245,10 +245,8 @@ schoolEntField = selectField schools
   where
     schools = optionsPersist [] [Asc SchoolName] schoolName
 
-multiFileField :: Maybe Bool -- ^ Override @unpackZips@-checkbox?
+multiFileField :: Handler (Set FileId) -> Field Handler (Source Handler (Either FileId File))
-               -> Handler (Set FileId) -- ^ Existing files to allow keeping
+multiFileField permittedFiles' = Field{..}
-               -> Field Handler (Source Handler (Either FileId File))
-multiFileField doUnpackOverride permittedFiles' = Field{..}
   where
     fieldEnctype = Multipart
     fieldParse vals files
@@ -272,9 +270,7 @@ multiFileField doUnpackOverride permittedFiles' = Field{..}
               | otherwise = yieldM . acceptFile
           mapM_ handleFile files .| C.map Right
       where
-        doUnpack = case doUnpackOverride of
+        doUnpack = unpackZips `elem` vals
-          Nothing -> unpackZips `elem` vals
-          Just o  -> o
     fieldView fieldId fieldName attrs val req = do
       pVals <- handlerToWidget permittedFiles'
       sentVals <- for val $ \src -> handlerToWidget . sourceToList $ src .| takeLefts

templates/multiFileField.hamlet

@@ -16,9 +16,6 @@ $forall FileUploadInfo{..} <- fileInfos
 $# new files
 <input type="file" name=#{fieldName} multiple>
 
-$case doUnpackOverride
+<div .file-input__unpack>
-  $of Nothing
+  <label for=#{fieldId}_zip>ZIPs entpacken
-    <div .file-input__unpack>
+  <input type=checkbox id=#{fieldId}_zip name=#{fieldName} value=#{unpackZips} :req:required>
-      <label for=#{fieldId}_zip>ZIPs entpacken
-      <input type=checkbox id=#{fieldId}_zip name=#{fieldName} value=#{unpackZips} :req:required>
-  $of _