inhji/chiya
inhji/chiya
1
1
Fork 0
Code Issues 8 Pull requests 9 Activity

Merge pull request 'devel' (#241) from devel into main

Browse source 
Reviewed-on: #241
This commit is contained in:
inhji 2023-07-29 16:59:14 +02:00
commit c832f7812c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/chiya/site.ex
View file

@ -7,7 +7,7 @@ defmodule Chiya.Site do
alias Chiya.Repo alias Chiya.Repo
alias Chiya.Site.Setting alias Chiya.Site.Setting
@preloads [:home_channel, :default_channel, :micropub_channel, :wiki_channel] @preloads [:home_channel, :default_channel, :micropub_channel, :wiki_channel, :bookmark_channel]
@default_settings %{ @default_settings %{
title: "Site Title", title: "Site Title",
subtitle: "Subtitle", subtitle: "Subtitle",

2
lib/chiya_web/controllers/page_controller.ex
View file

@ -87,7 +87,7 @@ defmodule ChiyaWeb.PageController do
def bookmarks(conn, _params) do def bookmarks(conn, _params) do
[channel, notes] = [channel, notes] =
case conn.assigns.settings.wiki_channel_id do case conn.assigns.settings.bookmark_channel_id do
nil -> nil ->
[nil, nil] [nil, nil]