diff --git a/cmd/users.go b/cmd/users.go index ade7e388..df535c97 100644 --- a/cmd/users.go +++ b/cmd/users.go @@ -27,14 +27,13 @@ var usersCmd = &cobra.Command{ func printUsers(usrs []*users.User) { w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0) - fmt.Fprintln(w, "ID\tUsername\tScope\tTrash Dir\tLocale\tV. Mode\tS.Click\tAdmin\tExecute\tCreate\tRename\tModify\tDelete\tShare\tDownload\tPwd Lock") + fmt.Fprintln(w, "ID\tUsername\tScope\tLocale\tV. Mode\tS.Click\tAdmin\tExecute\tCreate\tRename\tModify\tDelete\tShare\tDownload\tPwd Lock") for _, u := range usrs { - fmt.Fprintf(w, "%d\t%s\t%s\t%s\t%s\t%s\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t\n", + fmt.Fprintf(w, "%d\t%s\t%s\t%s\t%s\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t\n", u.ID, u.Username, u.Scope, - u.TrashDir, u.Locale, u.ViewMode, u.SingleClick, diff --git a/http/resource.go b/http/resource.go index 878894fe..1b045cd5 100644 --- a/http/resource.go +++ b/http/resource.go @@ -21,6 +21,8 @@ import ( "github.com/filebrowser/filebrowser/v2/fileutils" ) +const unarchiveAction = "unarchive" + var resourceGetHandler = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) { file, err := files.NewFileInfo(files.FileOptions{ Fs: d.user.Fs, @@ -258,7 +260,7 @@ func resourcePatchHandler(fileCache FileCache) handleFunc { override := r.URL.Query().Get("override") == "true" rename := r.URL.Query().Get("rename") == "true" - unarchive := action == "unarchive" + unarchive := action == unarchiveAction if !override && !rename && !unarchive { if _, err = d.user.Fs.Stat(dst); err == nil { return http.StatusConflict, nil @@ -360,7 +362,7 @@ func patchAction(ctx context.Context, action, src, dst string, d *data, fileCach } return fileutils.Copy(d.user.Fs, src, dst) - case "unarchive": + case unarchiveAction: if !d.user.Perm.Create { return errors.ErrPermissionDenied }