squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Web.AdminAPI.AdminAPIController: Change right to permission group (except for function names)

Browse Source
This commit is contained in:
Haelwenn (lanodan) Monnier 2018-11-10 15:16:19 +01:00
parent 1a31d71187
commit e0b0fde713
No known key found for this signature in database
GPG Key ID: D5B7A8E43C997DEE
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/pleroma/web/admin_api/admin_api_controller.ex
View File

@ -40,13 +40,13 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
|> json(new_user.nickname) |> json(new_user.nickname)
end end
def right_add(conn, %{"right" => right, "nickname" => nickname}) def right_add(conn, %{"permission_group" => permission_group, "nickname" => nickname})
when right in ["moderator", "admin"] do when permission_group in ["moderator", "admin"] do
user = User.get_by_nickname(nickname) user = User.get_by_nickname(nickname)
info = info =
user.info user.info
|> Map.put("is_" <> right, true) |> Map.put("is_" <> permission_group, true)
cng = User.info_changeset(user, %{info: info}) cng = User.info_changeset(user, %{info: info})
{:ok, user} = User.update_and_set_cache(cng) {:ok, user} = User.update_and_set_cache(cng)
@ -65,17 +65,17 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
def right_add(conn, _) do def right_add(conn, _) do
conn conn
|> put_status(404) |> put_status(404)
|> json(%{error: "No such right"}) |> json(%{error: "No such permission_group"})
end end
def right_delete( def right_delete(
%{assigns: %{user: %User{:nickname => admin_nickname}}} = conn, %{assigns: %{user: %User{:nickname => admin_nickname}}} = conn,
%{ %{
"right" => right, "permission_group" => permission_group,
"nickname" => nickname "nickname" => nickname
} }
) )
when right in ["moderator", "admin"] do when permission_group in ["moderator", "admin"] do
if admin_nickname == nickname do if admin_nickname == nickname do
conn conn
|> put_status(403) |> put_status(403)
@ -85,7 +85,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
info = info =
user.info user.info
|> Map.put("is_" <> right, false) |> Map.put("is_" <> permission_group, false)
cng = User.info_changeset(user, %{info: info}) cng = User.info_changeset(user, %{info: info})
{:ok, user} = User.update_and_set_cache(cng) {:ok, user} = User.update_and_set_cache(cng)
@ -98,7 +98,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
def right_delete(conn, _) do def right_delete(conn, _) do
conn conn
|> put_status(404) |> put_status(404)
|> json(%{error: "No such right"}) |> json(%{error: "No such permission_group"})
end end
def relay_follow(conn, %{"relay_url" => target}) do def relay_follow(conn, %{"relay_url" => target}) do