mirror of
https://github.com/philomena-dev/philomena.git
synced 2024-11-30 14:57:59 +01:00
senior staff
This commit is contained in:
parent
23bd821838
commit
017890642f
6 changed files with 31 additions and 3 deletions
|
@ -117,6 +117,7 @@ defmodule Philomena.Users.User do
|
||||||
field :scratchpad, :string
|
field :scratchpad, :string
|
||||||
field :secondary_role, :string
|
field :secondary_role, :string
|
||||||
field :hide_default_role, :boolean, default: false
|
field :hide_default_role, :boolean, default: false
|
||||||
|
field :senior_staff, :boolean, default: false
|
||||||
|
|
||||||
# For avatar validation/persistence
|
# For avatar validation/persistence
|
||||||
field :avatar_width, :integer, virtual: true
|
field :avatar_width, :integer, virtual: true
|
||||||
|
@ -268,7 +269,7 @@ defmodule Philomena.Users.User do
|
||||||
|
|
||||||
def update_changeset(user, attrs, roles) do
|
def update_changeset(user, attrs, roles) do
|
||||||
user
|
user
|
||||||
|> cast(attrs, [:name, :email, :role, :secondary_role, :hide_default_role])
|
|> cast(attrs, [:name, :email, :role, :secondary_role, :hide_default_role, :senior_staff])
|
||||||
|> validate_required([:name, :email, :role])
|
|> validate_required([:name, :email, :role])
|
||||||
|> validate_inclusion(:role, ["user", "assistant", "moderator", "admin"])
|
|> validate_inclusion(:role, ["user", "assistant", "moderator", "admin"])
|
||||||
|> put_assoc(:roles, roles)
|
|> put_assoc(:roles, roles)
|
||||||
|
|
|
@ -21,6 +21,9 @@
|
||||||
label.table-list__label
|
label.table-list__label
|
||||||
.table-list__label__text Hide staff banner:
|
.table-list__label__text Hide staff banner:
|
||||||
.table-list__label__input = checkbox f, :hide_default_role, class: "checkbox"
|
.table-list__label__input = checkbox f, :hide_default_role, class: "checkbox"
|
||||||
|
label.table-list__label
|
||||||
|
.table-list__label__text Senior staff:
|
||||||
|
.table-list__label__input = checkbox f, :senior_staff, class: "checkbox"
|
||||||
.table-list__label
|
.table-list__label
|
||||||
.table-list__label__text Avatar
|
.table-list__label__text Avatar
|
||||||
.table-list__label__input
|
.table-list__label__input
|
||||||
|
@ -29,6 +32,10 @@
|
||||||
.block
|
.block
|
||||||
.block__header
|
.block__header
|
||||||
span.block__header__title General user flags
|
span.block__header__title General user flags
|
||||||
|
ul
|
||||||
|
p
|
||||||
|
strong> Be careful when issuing these permissions to staff members!
|
||||||
|
| Staff members with relevant roles may have these permissions anyway. Issuing them may break things, such as tag aliasing.
|
||||||
ul = collection_checkboxes f, :roles, filtered_roles(general_permissions(), @roles), mapper: &checkbox_mapper/6
|
ul = collection_checkboxes f, :roles, filtered_roles(general_permissions(), @roles), mapper: &checkbox_mapper/6
|
||||||
|
|
||||||
.block
|
.block
|
||||||
|
|
|
@ -107,12 +107,21 @@ defmodule PhilomenaWeb.UserAttributionView do
|
||||||
|
|
||||||
defp secondary_role(labels, _user), do: labels
|
defp secondary_role(labels, _user), do: labels
|
||||||
|
|
||||||
|
defp staff_role(labels, %{hide_default_role: false, role: "admin", senior_staff: true}),
|
||||||
|
do: [{"label--danger", "Head Administrator"} | labels]
|
||||||
|
|
||||||
defp staff_role(labels, %{hide_default_role: false, role: "admin"}),
|
defp staff_role(labels, %{hide_default_role: false, role: "admin"}),
|
||||||
do: [{"label--danger", "Site Administrator"} | labels]
|
do: [{"label--danger", "Site Administrator"} | labels]
|
||||||
|
|
||||||
|
defp staff_role(labels, %{hide_default_role: false, role: "moderator", senior_staff: true}),
|
||||||
|
do: [{"label--success", "Senior Moderator"} | labels]
|
||||||
|
|
||||||
defp staff_role(labels, %{hide_default_role: false, role: "moderator"}),
|
defp staff_role(labels, %{hide_default_role: false, role: "moderator"}),
|
||||||
do: [{"label--success", "Site Moderator"} | labels]
|
do: [{"label--success", "Site Moderator"} | labels]
|
||||||
|
|
||||||
|
defp staff_role(labels, %{hide_default_role: false, role: "assistant", senior_staff: true}),
|
||||||
|
do: [{"label--purple", "Senior Assistant"} | labels]
|
||||||
|
|
||||||
defp staff_role(labels, %{hide_default_role: false, role: "assistant"}),
|
defp staff_role(labels, %{hide_default_role: false, role: "assistant"}),
|
||||||
do: [{"label--purple", "Site Assistant"} | labels]
|
do: [{"label--purple", "Site Assistant"} | labels]
|
||||||
|
|
||||||
|
|
9
priv/repo/migrations/20200817213256_add_senior_staff.exs
Normal file
9
priv/repo/migrations/20200817213256_add_senior_staff.exs
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
defmodule Philomena.Repo.Migrations.AddSeniorStaff do
|
||||||
|
use Ecto.Migration
|
||||||
|
|
||||||
|
def change do
|
||||||
|
alter table(:users) do
|
||||||
|
add :senior_staff, :boolean, default: false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -1974,7 +1974,8 @@ CREATE TABLE public.users (
|
||||||
otp_backup_codes character varying[],
|
otp_backup_codes character varying[],
|
||||||
last_renamed_at timestamp without time zone DEFAULT '1970-01-01 00:00:00'::timestamp without time zone NOT NULL,
|
last_renamed_at timestamp without time zone DEFAULT '1970-01-01 00:00:00'::timestamp without time zone NOT NULL,
|
||||||
forced_filter_id bigint,
|
forced_filter_id bigint,
|
||||||
confirmed_at timestamp(0) without time zone
|
confirmed_at timestamp(0) without time zone,
|
||||||
|
senior_staff boolean DEFAULT false
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
@ -4794,3 +4795,4 @@ INSERT INTO public."schema_migrations" (version) VALUES (20200617111116);
|
||||||
INSERT INTO public."schema_migrations" (version) VALUES (20200617113333);
|
INSERT INTO public."schema_migrations" (version) VALUES (20200617113333);
|
||||||
INSERT INTO public."schema_migrations" (version) VALUES (20200706171350);
|
INSERT INTO public."schema_migrations" (version) VALUES (20200706171350);
|
||||||
INSERT INTO public."schema_migrations" (version) VALUES (20200725234412);
|
INSERT INTO public."schema_migrations" (version) VALUES (20200725234412);
|
||||||
|
INSERT INTO public."schema_migrations" (version) VALUES (20200817213256);
|
||||||
|
|
Loading…
Reference in a new issue