From 55babc1402eb5a0ce36ddcb33ba7f13c35a0e0ab Mon Sep 17 00:00:00 2001 From: Julien Loir Date: Sun, 8 Nov 2020 17:30:44 +0100 Subject: [PATCH] Add configuration entry in settings models --- http/auth.go | 2 ++ settings/defaults.go | 14 ++++++++------ users/users.go | 1 + 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/http/auth.go b/http/auth.go index 5c47fcf1..13893ee9 100644 --- a/http/auth.go +++ b/http/auth.go @@ -23,6 +23,7 @@ type userInfo struct { ID uint `json:"id"` Locale string `json:"locale"` ViewMode users.ViewMode `json:"viewMode"` + SingleClick bool `json:"singleClick"` Perm users.Permissions `json:"perm"` Commands []string `json:"commands"` LockPassword bool `json:"lockPassword"` @@ -172,6 +173,7 @@ func printToken(w http.ResponseWriter, _ *http.Request, d *data, user *users.Use ID: user.ID, Locale: user.Locale, ViewMode: user.ViewMode, + SingleClick: user.SingleClick, Perm: user.Perm, LockPassword: user.LockPassword, Commands: user.Commands, diff --git a/settings/defaults.go b/settings/defaults.go index b0829655..5fa2717a 100644 --- a/settings/defaults.go +++ b/settings/defaults.go @@ -8,12 +8,13 @@ import ( // UserDefaults is a type that holds the default values // for some fields on User. type UserDefaults struct { - Scope string `json:"scope"` - Locale string `json:"locale"` - ViewMode users.ViewMode `json:"viewMode"` - Sorting files.Sorting `json:"sorting"` - Perm users.Permissions `json:"perm"` - Commands []string `json:"commands"` + Scope string `json:"scope"` + Locale string `json:"locale"` + ViewMode users.ViewMode `json:"viewMode"` + SingleClick bool `json:"singleClick"` + Sorting files.Sorting `json:"sorting"` + Perm users.Permissions `json:"perm"` + Commands []string `json:"commands"` } // Apply applies the default options to a user. @@ -21,6 +22,7 @@ func (d *UserDefaults) Apply(u *users.User) { u.Scope = d.Scope u.Locale = d.Locale u.ViewMode = d.ViewMode + u.SingleClick = d.SingleClick u.Perm = d.Perm u.Sorting = d.Sorting u.Commands = d.Commands diff --git a/users/users.go b/users/users.go index 1df0a89b..199dd193 100644 --- a/users/users.go +++ b/users/users.go @@ -28,6 +28,7 @@ type User struct { Locale string `json:"locale"` LockPassword bool `json:"lockPassword"` ViewMode ViewMode `json:"viewMode"` + SingleClick bool `json:"singleClick"` Perm Permissions `json:"perm"` Commands []string `json:"commands"` Sorting files.Sorting `json:"sorting"`