diff --git a/caddy/parser/parser.go b/caddy/parser/parser.go index bc42fdfa..63a3fc76 100644 --- a/caddy/parser/parser.go +++ b/caddy/parser/parser.go @@ -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": diff --git a/cmd/filemanager/main.go b/cmd/filemanager/main.go index 430d7586..de708bba 100644 --- a/cmd/filemanager/main.go +++ b/cmd/filemanager/main.go @@ -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", "") diff --git a/filemanager.go b/filemanager.go index b5156b69..04e04578 100644 --- a/filemanager.go +++ b/filemanager.go @@ -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") } } diff --git a/http/users.go b/http/users.go index 9ffee669..9846217e 100644 --- a/http/users.go +++ b/http/users.go @@ -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)