From 44b004f9ec351bebfc8e56ade6e011e527f3d6a9 Mon Sep 17 00:00:00 2001 From: "byte[]" Date: Thu, 30 Apr 2020 00:38:47 -0400 Subject: [PATCH] fixes #80: broken presence check on tag_id param --- lib/philomena_web/controllers/dnp_entry_controller.ex | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/philomena_web/controllers/dnp_entry_controller.ex b/lib/philomena_web/controllers/dnp_entry_controller.ex index a531e57c..8455e68d 100644 --- a/lib/philomena_web/controllers/dnp_entry_controller.ex +++ b/lib/philomena_web/controllers/dnp_entry_controller.ex @@ -131,7 +131,7 @@ defmodule PhilomenaWeb.DnpEntryController do end defp selectable_tags(conn) do - case not is_nil(conn.params["tag_id"]) and + case present?(conn.params["tag_id"]) and Canada.Can.can?(conn.assigns.current_user, :index, DnpEntry) do true -> [Repo.get!(Tag, conn.params["tag_id"])] false -> linked_tags(conn) @@ -146,6 +146,10 @@ defmodule PhilomenaWeb.DnpEntryController do defp linked_tags(_), do: [] + defp present?(nil), do: false + defp present?(""), do: false + defp present?(_), do: true + defp set_mod_notes(conn, _opts) do case Canada.Can.can?(conn.assigns.current_user, :index, ModNote) do true ->