PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2025-02-17 11:04:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

add deleted toggle to main search form

Browse source
This commit is contained in:
byte[] 2019-12-30 18:32:24 -05:00
parent 907e030b3a
commit 0c7f13932b
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/philomena/schema/search.ex
View file

@ -1,10 +1,10 @@
defmodule Philomena.Schema.Search do defmodule Philomena.Schema.Search do
alias Philomena.Images.Query alias Philomena.Images.Query
import Search.String alias Search.String
import Ecto.Changeset import Ecto.Changeset
def validate_search(changeset, field, user, watched \\ false) do def validate_search(changeset, field, user, watched \\ false) do
query = changeset |> get_field(field) |> normalize() query = changeset |> get_field(field) |> String.normalize()
output = Query.compile(user, query, watched) output = Query.compile(user, query, watched)
case output do case output do

10
lib/philomena_web/templates/search/_form.html.slime
View file

@ -129,5 +129,15 @@ h1 Search
"Ascending": :asc "Ascending": :asc
] ]
sort_hidden = [
"Exclude Deleted": "",
"Include Deleted/Merged": "1",
"Deleted Only": "deleted",
"Deleted/Merged Only": "only"
]
= select f, :sf, sort_fields, class: "input input--separate-left", name: "sf", autocomplete: "off", selected: @conn.params["sf"] = select f, :sf, sort_fields, class: "input input--separate-left", name: "sf", autocomplete: "off", selected: @conn.params["sf"]
= select f, :sd, sort_directions, class: "input input--separate-left", name: "sd", autocomplete: "off", selected: @conn.params["sd"] = select f, :sd, sort_directions, class: "input input--separate-left", name: "sd", autocomplete: "off", selected: @conn.params["sd"]
= if hides_images?(@conn) do
= select f, :del, sort_hidden, class: "input input--separate-left", name: "del", autocomplete: "off", selected: @conn.params["del"]

1
lib/philomena_web/views/search_view.ex
View file

@ -2,4 +2,5 @@ defmodule PhilomenaWeb.SearchView do
use PhilomenaWeb, :view use PhilomenaWeb, :view
def scope(conn), do: Philomena.ImageScope.scope(conn) def scope(conn), do: Philomena.ImageScope.scope(conn)
def hides_images?(conn), do: can?(conn, :hide, %Philomena.Images.Image{})
end end