ViewMode constants; default view modes

This commit is contained in:
Henrique Dias 2017-10-09 08:26:05 +01:00
parent 90c2de44c3
commit 8633e9677b
No known key found for this signature in database
GPG Key ID: 936F5EB68D786730
4 changed files with 12 additions and 5 deletions

View File

@ -154,7 +154,7 @@ func Parse(c *caddy.Controller, plugin string) ([]*filemanager.FileManager, erro
}
u.ViewMode = c.Val()
if u.ViewMode != "mosaic" && u.ViewMode != "list" {
if u.ViewMode != filemanager.MosaicViewMode && u.ViewMode != filemanager.ListViewMode {
return nil, c.ArgErr()
}
case "recaptcha_key":

View File

@ -85,7 +85,7 @@ func setupViper() {
viper.SetDefault("NoAuth", false)
viper.SetDefault("BaseURL", "")
viper.SetDefault("PrefixURL", "")
viper.SetDefault("ViewMode", "mosaic")
viper.SetDefault("ViewMode", filemanager.MosaicViewMode)
viper.SetDefault("ReCaptchaKey", "")
viper.SetDefault("ReCaptchaSecret", "")

View File

@ -22,7 +22,13 @@ import (
)
// Version is the current File Manager version.
const Version = "(untracked)"
const (
// Version is the current File Manager version.
Version = "(untracked)"
ListViewMode = "list"
MosaicViewMode = "mosaic"
)
var (
ErrExist = errors.New("the resource already exists")
@ -207,8 +213,8 @@ func (m *FileManager) Setup() error {
// TODO: remove this after 1.5
for _, user := range users {
if user.ViewMode != "list" && user.ViewMode != "mosaic" {
user.ViewMode = "list"
if user.ViewMode != ListViewMode && user.ViewMode != MosaicViewMode {
user.ViewMode = ListViewMode
m.Store.Users.Update(user, "ViewMode")
}
}

View File

@ -182,6 +182,7 @@ func usersPostHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (in
}
u.Password = pw
u.ViewMode = fm.MosaicViewMode
// Saves the user to the database.
err = c.Store.Users.Save(u)