From 179d8a27d9bedc0110e81ee0e60a2fa28801cd11 Mon Sep 17 00:00:00 2001 From: "byte[]" Date: Sun, 8 Dec 2019 13:22:38 -0500 Subject: [PATCH] images in report queue --- lib/philomena/polymorphic.ex | 2 +- .../templates/admin/report/_reports.html.slime | 1 + lib/philomena_web/views/admin/report_view.ex | 11 +++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/philomena/polymorphic.ex b/lib/philomena/polymorphic.ex index bcece4eb..e7c48aea 100644 --- a/lib/philomena/polymorphic.ex +++ b/lib/philomena/polymorphic.ex @@ -18,7 +18,7 @@ defmodule Philomena.Polymorphic do } @preloads %{ - "Comment" => [:user, :image], + "Comment" => [:user, image: :tags], "Commission" => [:user], "Conversation" => [:from, :to], "Gallery" => [:creator], diff --git a/lib/philomena_web/templates/admin/report/_reports.html.slime b/lib/philomena_web/templates/admin/report/_reports.html.slime index 5d83ea48..853620a6 100644 --- a/lib/philomena_web/templates/admin/report/_reports.html.slime +++ b/lib/philomena_web/templates/admin/report/_reports.html.slime @@ -11,6 +11,7 @@ table.table = for report <- @reports do tr td + => reported_image @conn, report.reportable = link_to_reported_thing @conn, report.reportable td span title=report.reason diff --git a/lib/philomena_web/views/admin/report_view.ex b/lib/philomena_web/views/admin/report_view.ex index 3fd66947..3bb3469b 100644 --- a/lib/philomena_web/views/admin/report_view.ex +++ b/lib/philomena_web/views/admin/report_view.ex @@ -1,6 +1,9 @@ defmodule PhilomenaWeb.Admin.ReportView do use PhilomenaWeb, :view + alias Philomena.Images.Image + alias Philomena.Comments.Comment + import PhilomenaWeb.ReportView, only: [link_to_reported_thing: 2, report_row_class: 1, pretty_state: 1] import PhilomenaWeb.ProfileView, only: [user_abbrv: 2, current?: 2] @@ -20,4 +23,12 @@ defmodule PhilomenaWeb.Admin.ReportView do def ordered_tags(tags) do Enum.sort_by(tags, & &1.name) end + + def reported_image(conn, %Image{} = image) do + render PhilomenaWeb.ImageView, "_image_container.html", image: image, size: :thumb_tiny, conn: conn + end + def reported_image(conn, %Comment{image: image}) do + render PhilomenaWeb.ImageView, "_image_container.html", image: image, size: :thumb_tiny, conn: conn + end + def reported_image(_conn, _reportable), do: nil end