TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-05 10:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #199 from eikek/fix-form-init

Browse Source 
Fixes a race condition when initializing the calendar-event field
This commit is contained in:
mergify[bot] 2020-08-01 09:49:50 +00:00 committed by GitHub
commit 228d2d3385
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/webapp/src/main/elm/Comp/CalEventInput.elm
View File

@ -2,6 +2,7 @@ module Comp.CalEventInput exposing
( Model ( Model
, Msg , Msg
, init , init
, initDefault
, update , update
, view , view
) )
@ -36,6 +37,11 @@ type Msg
| CheckInputMsg CalEvent (Result Http.Error CalEventCheckResult) | CheckInputMsg CalEvent (Result Http.Error CalEventCheckResult)
initDefault : Model
initDefault =
Model Nothing
init : Flags -> CalEvent -> ( Model, Cmd Msg ) init : Flags -> CalEvent -> ( Model, Cmd Msg )
init flags ev = init flags ev =
( Model Nothing, checkInput flags ev ) ( Model Nothing, checkInput flags ev )

5
modules/webapp/src/main/elm/Comp/NotificationForm.elm
View File

@ -133,8 +133,8 @@ init flags =
initialSchedule = initialSchedule =
Data.Validated.Unknown Data.CalEvent.everyMonth Data.Validated.Unknown Data.CalEvent.everyMonth
( sm, sc ) = sm =
Comp.CalEventInput.init flags Data.CalEvent.everyMonth Comp.CalEventInput.initDefault
in in
( { settings = Api.Model.NotificationSettings.empty ( { settings = Api.Model.NotificationSettings.empty
, connectionModel = , connectionModel =
@ -159,7 +159,6 @@ init flags =
, Cmd.batch , Cmd.batch
[ Api.getMailSettings flags "" ConnResp [ Api.getMailSettings flags "" ConnResp
, Api.getTags flags "" GetTagsResp , Api.getTags flags "" GetTagsResp
, Cmd.map CalEventMsg sc
] ]
) )

5
modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm
View File

@ -136,8 +136,8 @@ init flags =
initialSchedule = initialSchedule =
Data.Validated.Unknown Data.CalEvent.everyMonth Data.Validated.Unknown Data.CalEvent.everyMonth
( sm, sc ) = sm =
Comp.CalEventInput.init flags Data.CalEvent.everyMonth Comp.CalEventInput.initDefault
in in
( { settings = Api.Model.ScanMailboxSettings.empty ( { settings = Api.Model.ScanMailboxSettings.empty
, connectionModel = , connectionModel =
@ -168,7 +168,6 @@ init flags =
} }
, Cmd.batch , Cmd.batch
[ Api.getImapSettings flags "" ConnResp [ Api.getImapSettings flags "" ConnResp
, Cmd.map CalEventMsg sc
, Api.getFolders flags "" False GetFolderResp , Api.getFolders flags "" False GetFolderResp
] ]
) )