diff options
Diffstat (limited to 'elm')
| -rw-r--r-- | elm/DocEdit.elm | 9 | ||||
| -rw-r--r-- | elm/StaffEdit/Main.elm | 14 | ||||
| -rw-r--r-- | elm/User/Edit.elm | 2 | ||||
| -rw-r--r-- | elm/User/Login.elm | 4 | ||||
| -rw-r--r-- | elm/User/Register.elm | 2 |
5 files changed, 13 insertions, 18 deletions
diff --git a/elm/DocEdit.elm b/elm/DocEdit.elm index c0ab746c..3fad1f8f 100644 --- a/elm/DocEdit.elm +++ b/elm/DocEdit.elm @@ -45,7 +45,8 @@ init d = encode : Model -> GD.Send encode model = - { editsum = model.editsum.editsum.data + { id = model.id + , editsum = model.editsum.editsum.data , hidden = model.editsum.hidden , locked = model.editsum.locked , title = model.title @@ -69,10 +70,8 @@ update msg model = Content m -> let (nm,nc) = TP.update m model.content in ({ model | content = nm }, Cmd.map Content nc) Submit -> - let - path = "/d" ++ String.fromInt model.id ++ "/edit" - body = GD.encode (encode model) - in ({ model | state = Api.Loading }, Api.post path body Submitted) + let body = GD.encode (encode model) + in ({ model | state = Api.Loading }, Api.post "/d/edit.json" body Submitted) Submitted (GApi.Changed id rev) -> (model, load <| "/d" ++ String.fromInt id ++ "." ++ String.fromInt rev) Submitted r -> ({ model | state = Api.Error r }, Cmd.none) diff --git a/elm/StaffEdit/Main.elm b/elm/StaffEdit/Main.elm index d3e287da..4ea50fd5 100644 --- a/elm/StaffEdit/Main.elm +++ b/elm/StaffEdit/Main.elm @@ -57,7 +57,7 @@ init d = , l_twitter = d.l_twitter , l_anidb = d.l_anidb , l_pixiv = d.l_pixiv - , id = Just d.id + , id = d.id } @@ -82,7 +82,8 @@ new = encode : Model -> GSE.Send encode model = - { editsum = model.editsum.editsum.data + { id = model.id + , editsum = model.editsum.editsum.data , hidden = model.editsum.hidden , locked = model.editsum.locked , aid = model.aid @@ -147,13 +148,8 @@ update msg model = AliasAdd -> ({ model | alias = model.alias ++ [{ aid = newAid model, name = "", original = "", inuse = False }] }, Cmd.none) Submit -> - let - path = - case model.id of - Just id -> "/s" ++ String.fromInt id ++ "/edit" - Nothing -> "/s/add" - body = GSE.encode (encode model) - in ({ model | state = Api.Loading }, Api.post path body Submitted) + let body = GSE.encode (encode model) + in ({ model | state = Api.Loading }, Api.post "/s/edit.json" body Submitted) Submitted (GApi.Changed id rev) -> (model, load <| "/s" ++ String.fromInt id ++ "." ++ String.fromInt rev) Submitted r -> ({ model | state = Api.Error r }, Cmd.none) diff --git a/elm/User/Edit.elm b/elm/User/Edit.elm index 1a9b9a55..df1647e4 100644 --- a/elm/User/Edit.elm +++ b/elm/User/Edit.elm @@ -124,7 +124,7 @@ update msg model = Submit -> if model.cpass && model.pass1 /= model.pass2 then ({ model | passNeq = True }, Cmd.none ) - else ({ model | state = Api.Loading }, Api.post "/u/edit" (GUE.encode model.data) Submitted) + else ({ model | state = Api.Loading }, Api.post "/u/edit.json" (GUE.encode model.data) Submitted) -- TODO: This reload is only necessary for the skin and customcss options to apply, but it's nicer to do that directly from JS. Submitted GApi.Success -> (model, load <| "/u" ++ String.fromInt model.data.id ++ "/edit") diff --git a/elm/User/Login.elm b/elm/User/Login.elm index cc25d132..d28faf6b 100644 --- a/elm/User/Login.elm +++ b/elm/User/Login.elm @@ -80,11 +80,11 @@ update msg model = Submit -> if not model.insecure then ( { model | state = Api.Loading } - , Api.post "/u/login" (encodeLogin model) Submitted ) + , Api.post "/u/login.json" (encodeLogin model) Submitted ) else if model.newpass1 /= model.newpass2 then ( { model | noteq = True }, Cmd.none ) else ( { model | state = Api.Loading } - , Api.post "/u/changepass" (encodeChangePass model) Submitted ) + , Api.post "/u/changepass.json" (encodeChangePass model) Submitted ) Submitted GApi.Success -> (model, load model.ref) Submitted GApi.InsecurePass -> ({ model | insecure = True, state = if model.insecure then Api.Error GApi.InsecurePass else Api.Normal }, Cmd.none) diff --git a/elm/User/Register.elm b/elm/User/Register.elm index add16418..60f5d7d4 100644 --- a/elm/User/Register.elm +++ b/elm/User/Register.elm @@ -62,7 +62,7 @@ update msg model = VNs n -> ({ model | vns = Maybe.withDefault model.vns (String.toInt n) }, Cmd.none) Submit -> ( { model | state = Api.Loading } - , Api.post "/u/register" (encodeForm model) Submitted ) + , Api.post "/u/register.json" (encodeForm model) Submitted ) Submitted GApi.Success -> ({ model | success = True }, Cmd.none) Submitted e -> ({ model | state = Api.Error e }, Cmd.none) |