From 9f6ac9753d7d80573ad5ad1ad1861e10f8b5fdd4 Mon Sep 17 00:00:00 2001 From: "byte[]" Date: Sun, 8 Dec 2019 12:48:39 -0500 Subject: [PATCH] fix warnings --- lib/philomena/reports/attribution.ex | 2 +- lib/philomena/reports/query.ex | 1 - lib/philomena_web/controllers/admin/report_controller.ex | 2 +- lib/philomena_web/templates/admin/report/index.html.slime | 2 +- lib/philomena_web/views/profile_view.ex | 6 +++--- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/philomena/reports/attribution.ex b/lib/philomena/reports/attribution.ex index 900df127..5f264b05 100644 --- a/lib/philomena/reports/attribution.ex +++ b/lib/philomena/reports/attribution.ex @@ -7,7 +7,7 @@ defimpl Philomena.Attribution, for: Philomena.Reports.Report do to_string(report.user_id || report.fingerprint || report.ip) end - def anonymous?(report) do + def anonymous?(_report) do false end end \ No newline at end of file diff --git a/lib/philomena/reports/query.ex b/lib/philomena/reports/query.ex index b53a7e06..3f49efec 100644 --- a/lib/philomena/reports/query.ex +++ b/lib/philomena/reports/query.ex @@ -7,7 +7,6 @@ defmodule Philomena.Reports.Query do ip_fields = ~W(ip) bool_fields = ~W(open) ngram_fields = ~W(reason) - custom_fields = ~W(author user_id) default_field = "reason" @parser Parser.parser( diff --git a/lib/philomena_web/controllers/admin/report_controller.ex b/lib/philomena_web/controllers/admin/report_controller.ex index 2302929e..fa791015 100644 --- a/lib/philomena_web/controllers/admin/report_controller.ex +++ b/lib/philomena_web/controllers/admin/report_controller.ex @@ -8,7 +8,7 @@ defmodule PhilomenaWeb.Admin.ReportController do alias Philomena.Repo import Ecto.Query - plug :load_and_authorize_resource, model: Report, preload: [:admin, user: [:linked_tags, awards: :badge]] + plug :load_and_authorize_resource, model: Report, only: [:show], preload: [:admin, user: [:linked_tags, awards: :badge]] def index(conn, %{"rq" => query_string}) do {:ok, query} = Query.compile(query_string) diff --git a/lib/philomena_web/templates/admin/report/index.html.slime b/lib/philomena_web/templates/admin/report/index.html.slime index 90ca2009..371d9c63 100644 --- a/lib/philomena_web/templates/admin/report/index.html.slime +++ b/lib/philomena_web/templates/admin/report/index.html.slime @@ -1,5 +1,5 @@ - route = fn p -> Routes.admin_report_path(@conn, :index, p) end -- pagination = render PhilomenaWeb.PaginationView, "_pagination.html", page: @reports +- pagination = render PhilomenaWeb.PaginationView, "_pagination.html", route: route, page: @reports, conn: @conn h1 Reports diff --git a/lib/philomena_web/views/profile_view.ex b/lib/philomena_web/views/profile_view.ex index 107c2091..1db81795 100644 --- a/lib/philomena_web/views/profile_view.ex +++ b/lib/philomena_web/views/profile_view.ex @@ -57,13 +57,13 @@ defmodule PhilomenaWeb.ProfileView do defp initials_abbrv(name) do case String.split(name, " ", parts: 4) do - [<>, <>, <>, <>] -> + [<>, <>, <>, <>] -> <> - [<>, <>, <>] -> + [<>, <>, <>] -> <> - [<>, <>] -> + [<>, <>] -> <> _ ->