Merge branch 'master' into workflows

This commit is contained in:
Gregor Kleen 2020-09-29 11:10:48 +02:00
commit 0ced4094c9
5 changed files with 12 additions and 5 deletions

View File

@ -2,6 +2,13 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
### [20.5.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v20.5.0...v20.5.1) (2020-09-29)
### Bug Fixes
* **exams:** default exam mode to Nothing ([4b459ea](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/4b459ea1430a4947364562f1a9881596325696ad))
## [20.5.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v20.4.1...v20.5.0) (2020-09-28)

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "uni2work",
"version": "20.5.0",
"version": "20.5.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@ -1,6 +1,6 @@
{
"name": "uni2work",
"version": "20.5.0",
"version": "20.5.1",
"description": "",
"keywords": [],
"author": "",

View File

@ -1,5 +1,5 @@
name: uniworx
version: 20.5.0
version: 20.5.1
dependencies:
- base

View File

@ -2013,9 +2013,9 @@ customPresetForm :: forall a custom preset msg.
-> Maybe (Maybe a)
-> AForm Handler (Maybe a)
customPresetForm cpL noneOption customOption toOption customForm fs mPrev
= explainedMultiActionA actionMap options fs mPrev'
= explainedMultiActionA actionMap options fs $ Just mPrev'
where
mPrev' = flip fmap mPrev $ preview (_Just . cpL) >>> \case
mPrev' = case mPrev ^? _Just . _Just . cpL of
Nothing -> CPFONone
Just (Left _) -> CPFOCustom
Just (Right p) -> CPFOPreset p