fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Allow overriding unpackZips-Checkbox"

Browse Source 
This reverts commit 8e43a314d3.
This commit is contained in:
Gregor Kleen 2018-04-04 12:21:43 +02:00
parent 272c61b512
commit 5e8698fee1
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Handler/Sheet.hs
View File

@ -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)

10
src/Handler/Utils/Form.hs
View File

@ -245,10 +245,8 @@ schoolEntField = selectField schools
where
schools = optionsPersist [] [Asc SchoolName] schoolName
multiFileField :: Maybe Bool -- ^ Override @unpackZips@-checkbox?
-> Handler (Set FileId) -- ^ Existing files to allow keeping
-> Field Handler (Source Handler (Either FileId File))
multiFileField doUnpackOverride permittedFiles' = Field{..}
multiFileField :: Handler (Set FileId) -> Field Handler (Source Handler (Either FileId File))
multiFileField 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
Nothing -> unpackZips `elem` vals
Just o -> o
doUnpack = unpackZips `elem` vals
fieldView fieldId fieldName attrs val req = do
pVals <- handlerToWidget permittedFiles'
sentVals <- for val $ \src -> handlerToWidget . sourceToList $ src .| takeLefts

9
templates/multiFileField.hamlet
View File

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