mirror of
https://github.com/philomena-dev/philomena.git
synced 2025-04-07 20:19:39 +02:00
Merge pull request #454 from mdashlw/tag-override-display-mod-notes
Update override display logic for tags
This commit is contained in:
commit
37fd3fc059
2 changed files with 5 additions and 4 deletions
lib/philomena_web
|
@ -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] ->
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue