PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2024-11-27 21:47:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

hide merge buttons when either image is hidden

Browse source
This commit is contained in:
byte[] 2020-09-06 14:24:32 -04:00
parent 0d359ee81e
commit aa8da0103f
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/philomena_web/templates/duplicate_report/_image_cell.html.slime
View file

@ -16,7 +16,7 @@
p p
= render PhilomenaWeb.UserAttributionView, "_anon_user.html", object: @image, conn: @conn = render PhilomenaWeb.UserAttributionView, "_anon_user.html", object: @image, conn: @conn
= if can?(@conn, :edit, @report) and same_rating_tags?(@report) do = if can?(@conn, :edit, @report) and mergeable?(@report) do
= if @source do = if @source do
a href=Routes.duplicate_report_accept_reverse_path(@conn, :create, @report) data-method="post" a href=Routes.duplicate_report_accept_reverse_path(@conn, :create, @report) data-method="post"
button.button button.button

4
lib/philomena_web/views/duplicate_report_view.ex
View file

@ -102,6 +102,10 @@ defmodule PhilomenaWeb.DuplicateReportView do
def both_are_alternate_versions?(%{image: image, duplicate_of_image: duplicate_of_image}), def both_are_alternate_versions?(%{image: image, duplicate_of_image: duplicate_of_image}),
do: alternate_version?(image) and alternate_version?(duplicate_of_image) do: alternate_version?(image) and alternate_version?(duplicate_of_image)
def mergeable?(%{image: image, duplicate_of_image: duplicate_of_image} = report) do
same_rating_tags?(report) and not image.hidden_from_users and not duplicate_of_image.hidden_from_users
end
defp artist_tags(%{tags: tags}) do defp artist_tags(%{tags: tags}) do
tags tags
|> Enum.filter(&(&1.namespace == "artist")) |> Enum.filter(&(&1.namespace == "artist"))