Merge pull request from mdashlw/tag-override-display-mod-notes

Update override display logic for tags
This commit is contained in:
liamwhite 2025-04-03 13:00:08 -04:00 committed by GitHub
commit 37fd3fc059
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
lib/philomena_web
templates/search
views

View file

@ -1,5 +1,5 @@
= cond do
- Enum.any?(@images) or override_display(@tags) ->
- Enum.any?(@images) or override_display(@conn, @tags) ->
= render PhilomenaWeb.ImageView, "index.html", conn: @conn, tags: @tags, images: @images, header: "Searching for #{@conn.params["q"]}", route: fn p -> ~p"/search?#{p}" end, scope: scope(@conn)
- assigns[:error] ->

View file

@ -4,9 +4,10 @@ defmodule PhilomenaWeb.SearchView do
def scope(conn), do: PhilomenaWeb.ImageScope.scope(conn)
def hides_images?(conn), do: can?(conn, :hide, %Philomena.Images.Image{})
def override_display([{_tag, _description, dnp_entries}]) do
Enum.any?(dnp_entries)
def override_display(conn, [{tag, _description, dnp_entries}]) do
tag.images_count > 0 or Enum.any?(dnp_entries) or
(present?(tag.mod_notes) and can?(conn, :edit, tag))
end
def override_display(_), do: false
def override_display(_conn, _tags), do: false
end