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

Keep form state after save

Browse Source
This commit is contained in:
eikek 2022-01-29 16:55:28 +01:00
parent e4527400ca
commit 040100f992
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/webapp/src/main/elm/Comp/UiSettingsForm.elm
View File

@ -9,6 +9,7 @@ module Comp.UiSettingsForm exposing
( Model ( Model
, Msg , Msg
, init , init
, initData
, toggleAllTabs , toggleAllTabs
, update , update
, view2 , view2
@ -178,6 +179,15 @@ init flags storedSettings defaults =
( initModel flags storedSettings defaults, Api.getTags flags "" Data.TagOrder.NameAsc GetTagsResp ) ( initModel flags storedSettings defaults, Api.getTags flags "" Data.TagOrder.NameAsc GetTagsResp )
initData : Flags -> StoredUiSettings -> UiSettings -> Model -> ( Model, Cmd Msg )
initData flags storedSettings defaults model =
let
( m, c ) =
init flags storedSettings defaults
in
( { m | openTabs = model.openTabs }, c )
type Msg type Msg
= SearchPageSizeMsg Comp.IntField.Msg = SearchPageSizeMsg Comp.IntField.Msg
| TagColorMsg Comp.ColorTagger.Msg | TagColorMsg Comp.ColorTagger.Msg

14
modules/webapp/src/main/elm/Comp/UiSettingsManage.elm
View File

@ -211,11 +211,17 @@ update flags settings msg model =
userDefaults = userDefaults =
Data.UiSettings.merge coll collDefaults Data.UiSettings.merge coll collDefaults
( um, uc ) = ( ( um, uc ), ( cm, cc ) ) =
Comp.UiSettingsForm.init flags user userDefaults case model.formData of
Just data ->
( Comp.UiSettingsForm.initData flags user userDefaults data.userModel
, Comp.UiSettingsForm.initData flags coll collDefaults data.collModel
)
( cm, cc ) = Nothing ->
Comp.UiSettingsForm.init flags coll collDefaults ( Comp.UiSettingsForm.init flags user userDefaults
, Comp.UiSettingsForm.init flags coll collDefaults
)
model_ = model_ =
{ model { model