PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2025-01-31 19:36:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove superfluous jason encode

Browse source
This commit is contained in:
byte[] 2019-12-21 14:51:43 -05:00
parent e1be291698
commit 0dab6a76e5
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/philomena_web/views/layout_view.ex
View file

@ -2,6 +2,7 @@ defmodule PhilomenaWeb.LayoutView do
use PhilomenaWeb, :view use PhilomenaWeb, :view
alias PhilomenaWeb.ImageView alias PhilomenaWeb.ImageView
alias Plug.Conn
def layout_class(conn) do def layout_class(conn) do
conn.assigns[:layout_class] || "layout--narrow" conn.assigns[:layout_class] || "layout--narrow"
@ -28,11 +29,12 @@ defmodule PhilomenaWeb.LayoutView do
defp ignored_tag_list(tags), do: Enum.map(tags, & &1.id) defp ignored_tag_list(tags), do: Enum.map(tags, & &1.id)
def clientside_data(conn) do def clientside_data(conn) do
conn = Conn.fetch_cookies(conn)
extra = Map.get(conn.assigns, :clientside_data, []) extra = Map.get(conn.assigns, :clientside_data, [])
interactions = Map.get(conn.assigns, :interactions, []) interactions = Map.get(conn.assigns, :interactions, [])
user = conn.assigns.current_user user = conn.assigns.current_user
filter = conn.assigns.current_filter filter = conn.assigns.current_filter
conn = Plug.Conn.fetch_cookies(conn)
data = [ data = [
filter_id: filter.id, filter_id: filter.id,
@ -51,7 +53,7 @@ defmodule PhilomenaWeb.LayoutView do
fancy_tag_upload: if(user, do: user.fancy_tag_field_on_upload, else: true), fancy_tag_upload: if(user, do: user.fancy_tag_field_on_upload, else: true),
interactions: Jason.encode!(interactions), interactions: Jason.encode!(interactions),
ignored_tag_list: Jason.encode!(ignored_tag_list(conn.assigns[:tags])), ignored_tag_list: Jason.encode!(ignored_tag_list(conn.assigns[:tags])),
hide_staff_tools: Jason.encode!(conn.cookies["hide_staff_tools"]) hide_staff_tools: conn.cookies["hide_staff_tools"]
] ]
data = Keyword.merge(data, extra) data = Keyword.merge(data, extra)