From c8b33f0ff6e719bc3200c392a302ed6f5b9b634a Mon Sep 17 00:00:00 2001 From: Joey <12476941+joeyponi@users.noreply.github.com> Date: Sun, 7 Jun 2020 21:32:04 -0500 Subject: [PATCH] Add Philomena Contrib Sec Role, Staff Page Visibility Toggle (#130) * Add Philomena Contributor to secondary roles list * Visibility toggle --- lib/philomena_web/controllers/staff_controller.ex | 6 +++--- lib/philomena_web/templates/admin/user/_form.html.slime | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/philomena_web/controllers/staff_controller.ex b/lib/philomena_web/controllers/staff_controller.ex index ca201058..fbda82cb 100644 --- a/lib/philomena_web/controllers/staff_controller.ex +++ b/lib/philomena_web/controllers/staff_controller.ex @@ -13,7 +13,7 @@ defmodule PhilomenaWeb.StaffController do |> Repo.all() categories = [ - Administrators: Enum.filter(users, &(&1.role == "admin")), + Administrators: Enum.filter(users, &(&1.role == "admin" and &1.hide_default_role == false)), "Technical Team": Enum.filter( users, @@ -22,8 +22,8 @@ defmodule PhilomenaWeb.StaffController do "Public Relations": Enum.filter(users, &(&1.role != "admin" and &1.secondary_role == "Public Relations")), Moderators: - Enum.filter(users, &(&1.role == "moderator" and &1.secondary_role in [nil, ""])), - Assistants: Enum.filter(users, &(&1.role == "assistant" and &1.secondary_role in [nil, ""])) + Enum.filter(users, &(&1.role == "moderator" and &1.secondary_role in [nil, ""] and &1.hide_default_role == false)), + Assistants: Enum.filter(users, &(&1.role == "assistant" and &1.secondary_role in [nil, ""] and &1.hide_default_role == false)) ] render(conn, "index.html", title: "Site Staff", categories: categories) diff --git a/lib/philomena_web/templates/admin/user/_form.html.slime b/lib/philomena_web/templates/admin/user/_form.html.slime index 16aa31d5..64a4fc34 100644 --- a/lib/philomena_web/templates/admin/user/_form.html.slime +++ b/lib/philomena_web/templates/admin/user/_form.html.slime @@ -17,7 +17,7 @@ .table-list__label__input = select f, :role, ["user", "assistant", "moderator", "admin"], class: "input" label.table-list__label .table-list__label__text Secondary banner: - .table-list__label__input = select f, :secondary_role, [[key: "-", value: ""], "Site Developer", "System Administrator", "Public Relations"], class: "input" + .table-list__label__input = select f, :secondary_role, [[key: "-", value: ""], "Site Developer", "System Administrator", "Philomena Contributor", "Public Relations"], class: "input" label.table-list__label .table-list__label__text Hide staff banner: .table-list__label__input = checkbox f, :hide_default_role, class: "checkbox"