oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-09-15 18:57:04 +00:00
Code Wiki Activity

Add optional sort option in category page

Browse source 
closes #1552
This commit is contained in:
Romain de Laage 2022-10-16 07:36:59 +02:00 • committed by Frédéric Guillot
parent ec47106c26
commit 83e1f154b5
26 changed files with 131 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ui/form/settings.go
View file

@ -31,6 +31,7 @@ type SettingsForm struct {
DefaultReadingSpeed int
CJKReadingSpeed int
DefaultHomePage string
CategoriesSortOrder string
}
// Merge updates the fields of the given user.
@ -50,6 +51,7 @@ func (s *SettingsForm) Merge(user *model.User) *model.User {
user.CJKReadingSpeed = s.CJKReadingSpeed
user.DefaultReadingSpeed = s.DefaultReadingSpeed
user.DefaultHomePage = s.DefaultHomePage
user.CategoriesSortOrder = s.CategoriesSortOrder
if s.Password != "" {
user.Password = s.Password
@ -114,5 +116,6 @@ func NewSettingsForm(r *http.Request) *SettingsForm {
DefaultReadingSpeed: int(defaultReadingSpeed),
CJKReadingSpeed: int(cjkReadingSpeed),
DefaultHomePage: r.FormValue("default_home_page"),
CategoriesSortOrder: r.FormValue("categories_sort_order"),
}
}

2
ui/settings_show.go
View file

@ -42,6 +42,7 @@ func (h *handler) showSettingsPage(w http.ResponseWriter, r *http.Request) {
DefaultReadingSpeed: user.DefaultReadingSpeed,
CJKReadingSpeed: user.CJKReadingSpeed,
DefaultHomePage: user.DefaultHomePage,
CategoriesSortOrder: user.CategoriesSortOrder,
}
timezones, err := h.store.Timezones()
@ -59,6 +60,7 @@ func (h *handler) showSettingsPage(w http.ResponseWriter, r *http.Request) {
view.Set("countUnread", h.store.CountUnreadEntries(user.ID))
view.Set("countErrorFeeds", h.store.CountUserFeedsWithErrors(user.ID))
view.Set("default_home_pages", model.HomePages())
view.Set("categories_sort_options", model.CategoriesSortOptions())
html.OK(w, r, view.Render("settings"))
}