nicoeri/filebrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: rename Rules to userRules;fix go lint errors

Browse Source
This commit is contained in:
jmq 2023-09-01 20:50:25 +08:00
parent 205832bde7
commit 00890a0fea
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
auth/hook.go
View File

@ -3,7 +3,6 @@ package auth
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/filebrowser/filebrowser/v2/rules"
"log" "log"
"net/http" "net/http"
"os" "os"
@ -12,6 +11,7 @@ import (
"github.com/filebrowser/filebrowser/v2/errors" "github.com/filebrowser/filebrowser/v2/errors"
"github.com/filebrowser/filebrowser/v2/files" "github.com/filebrowser/filebrowser/v2/files"
"github.com/filebrowser/filebrowser/v2/rules"
"github.com/filebrowser/filebrowser/v2/settings" "github.com/filebrowser/filebrowser/v2/settings"
"github.com/filebrowser/filebrowser/v2/users" "github.com/filebrowser/filebrowser/v2/users"
) )
@ -310,11 +310,11 @@ func (hf *hookFields) GetRules(k string, dv []rules.Rule) []rules.Rule {
if !ok { if !ok {
return dv return dv
} }
var Rules []rules.Rule var userRules []rules.Rule
err := json.Unmarshal([]byte(val), &Rules) err := json.Unmarshal([]byte(val), &userRules)
if err != nil { if err != nil {
log.Printf("hook: json format in user.perm.rules is incorrect. %s", err) log.Printf("hook: json format in user.perm.rules is incorrect. %s", err)
return dv return dv
} }
return Rules return userRules
} }