PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2024-11-27 13:47:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

improve ajax error messages

Browse source
This commit is contained in:
byte[] 2020-09-27 23:53:14 -04:00
parent fc159c3782
commit a00cdab739
3 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assets/js/utils/requests.js
View file

@ -8,7 +8,8 @@ function fetchJson(verb, endpoint, body) {
credentials: 'same-origin', credentials: 'same-origin',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'x-csrf-token': window.booru.csrfToken 'x-csrf-token': window.booru.csrfToken,
'x-requested-with': 'xmlhttprequest'
}, },
}; };
@ -24,7 +25,8 @@ function fetchHtml(endpoint) {
return fetch(endpoint, { return fetch(endpoint, {
credentials: 'same-origin', credentials: 'same-origin',
headers: { headers: {
'x-csrf-token': window.booru.csrfToken 'x-csrf-token': window.booru.csrfToken,
'x-requested-with': 'xmlhttprequest'
}, },
}); });
} }

18
lib/philomena_web/plugs/not_authorized_plug.ex
View file

@ -7,10 +7,18 @@ defmodule PhilomenaWeb.NotAuthorizedPlug do
def call(conn), do: call(conn, nil) def call(conn), do: call(conn, nil)
def call(conn, _opts) do def call(conn, _opts) do
conn case conn.assigns.ajax? do
|> Controller.fetch_flash() true ->
|> Controller.put_flash(:error, "You can't access that page.") conn
|> Controller.redirect(to: "/") |> Conn.resp(:forbidden, "You can't access that page.")
|> Conn.halt() |> Conn.halt()
_false ->
conn
|> Controller.fetch_flash()
|> Controller.put_flash(:error, "You can't access that page.")
|> Controller.redirect(to: "/")
|> Conn.halt()
end
end end
end end

18
lib/philomena_web/plugs/not_found_plug.ex
View file

@ -7,10 +7,18 @@ defmodule PhilomenaWeb.NotFoundPlug do
def call(conn), do: call(conn, nil) def call(conn), do: call(conn, nil)
def call(conn, _opts) do def call(conn, _opts) do
conn case conn.assigns.ajax? do
|> Controller.fetch_flash() true ->
|> Controller.put_flash(:error, "Couldn't find what you were looking for!") conn
|> Controller.redirect(to: "/") |> Conn.resp(:not_found, "Couldn't find what you were looking for!")
|> Conn.halt() |> Conn.halt()
false ->
conn
|> Controller.fetch_flash()
|> Controller.put_flash(:error, "Couldn't find what you were looking for!")
|> Controller.redirect(to: "/")
|> Conn.halt()
end
end end
end end