diff options
author | Yorhel <git@yorhel.nl> | 2020-03-09 09:25:48 +0100 |
---|---|---|
committer | Yorhel <git@yorhel.nl> | 2020-03-09 09:26:11 +0100 |
commit | 5e61abb08ac44f7fad4a9e992821053cdcf57b39 (patch) | |
tree | 18f8030b754564775a158f3570f5f513f4023d73 | |
parent | 220dfdad9046631bb94f839ea3949daef1c6229e (diff) |
refactor: Convert Staff edit form to the same initialization approach
As in 220dfdad9046631bb94f839ea3949daef1c6229e
-rw-r--r-- | elm/StaffEdit.elm (renamed from elm/StaffEdit/Main.elm) | 21 | ||||
-rw-r--r-- | elm/StaffEdit/New.elm | 12 | ||||
-rw-r--r-- | lib/VNWeb/Staff/Edit.pm | 12 |
3 files changed, 9 insertions, 36 deletions
diff --git a/elm/StaffEdit/Main.elm b/elm/StaffEdit.elm index 57f258ef..0347319b 100644 --- a/elm/StaffEdit/Main.elm +++ b/elm/StaffEdit.elm @@ -1,4 +1,4 @@ -module StaffEdit.Main exposing (Model, Msg, main, new, view, update) +module StaffEdit exposing (main) import Html exposing (..) import Html.Events exposing (..) @@ -61,25 +61,6 @@ init d = } -new : Model -new = - { state = Api.Normal - , editsum = Editsum.new - , alias = [ { aid = -1, name = "", original = "", inuse = False } ] - , aliasDup = False - , aid = -1 - , desc = TP.bbcode "" - , gender = "unknown" - , lang = "ja" - , l_site = "" - , l_wikidata = Nothing - , l_twitter = "" - , l_anidb = Nothing - , l_pixiv = 0 - , id = Nothing - } - - encode : Model -> GSE.Send encode model = { id = model.id diff --git a/elm/StaffEdit/New.elm b/elm/StaffEdit/New.elm deleted file mode 100644 index 64e58517..00000000 --- a/elm/StaffEdit/New.elm +++ /dev/null @@ -1,12 +0,0 @@ -module StaffEdit.New exposing (main) - -import Browser -import StaffEdit.Main as Main - -main : Program () Main.Model Main.Msg -main = Browser.element - { init = always (Main.new, Cmd.none) - , view = Main.view - , update = Main.update - , subscriptions = always Sub.none - } diff --git a/lib/VNWeb/Staff/Edit.pm b/lib/VNWeb/Staff/Edit.pm index 227da7f2..4503c108 100644 --- a/lib/VNWeb/Staff/Edit.pm +++ b/lib/VNWeb/Staff/Edit.pm @@ -13,8 +13,8 @@ my $FORM = { inuse => { anybool => 1, _when => 'out' }, } }, desc => { required => 0, default => '', maxlength => 5000 }, - gender => { required => 0, default => 'unknown', enum => [qw[unknown m f]] }, - lang => { language => 1 }, + gender => { default => 'unknown', enum => [qw[unknown m f]] }, + lang => { default => 'ja', language => 1 }, l_site => { required => 0, default => '', weburl => 1 }, l_wikidata => { required => 0, id => 1 }, l_twitter => { required => 0, default => '', regex => qr/^\S+$/, maxlength => 16 }, @@ -48,7 +48,7 @@ TUWF::get qr{/$RE{srev}/edit} => sub { framework_ title => "Edit $name", type => 's', dbobj => $e, tab => 'edit', sub { editmsg_ s => $e, "Edit $name"; - elm_ 'StaffEdit.Main' => $FORM_OUT, $e; + elm_ StaffEdit => $FORM_OUT, $e; }; }; @@ -58,7 +58,11 @@ TUWF::get qr{/s/new}, sub { framework_ title => 'Add staff member', sub { editmsg_ s => undef, 'Add staff member'; - elm_ 'StaffEdit.New'; + elm_ StaffEdit => $FORM_OUT, { + elm_empty($FORM_OUT)->%*, + alias => [ { aid => -1, name => '', original => '', inuse => 0 } ], + aid => -1 + }; }; }; |