Skip to content

K
koko
Unverified Commit 2a1db5d2 authored by Eric_Lee's avatar Eric_Lee Committed by GitHub
Browse files
Options

Merge pull request #171 from jumpserver/dev_bugfix 

[Update] fix web sftp
parents f6fae8e0 dcfdb3d7
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
pkg/model/nodetree.go
View file @ 2a1db5d2
...@@ -2,15 +2,15 @@ package model ...@@ -2,15 +2,15 @@ package model
import "encoding/json" import "encoding/json"
type NodeTreeList []NodeTreeAsset type NodeTreeList []NodeTreeAsset
type NodeTreeAsset struct { type NodeTreeAsset struct {
ID string `json:"id"` ID string `json:"id"`
Name string `json:"name"` Name string `json:"name"`
Title string `json:"title"` Title string `json:"title"`
Meta map[string]interface{} `json:"meta"` Pid string `json:"pId"`
IsParent bool `json:"isParent"`
Meta map[string]interface{} `json:"meta"`
} }
func ConvertMetaToNode(body []byte) (node Node, err error) { func ConvertMetaToNode(body []byte) (node Node, err error) {
......
pkg/srvconn/sftpconn.go
View file @ 2a1db5d2
...@@ -252,6 +252,9 @@ func (u *UserSftpConn) initial() { ...@@ -252,6 +252,9 @@ func (u *UserSftpConn) initial() {
u.Dirs = map[string]os.FileInfo{} u.Dirs = map[string]os.FileInfo{}
} }
for _, item := range nodeTrees { for _, item := range nodeTrees {
if item.Pid != "" {
continue
}
typeName, ok := item.Meta["type"].(string) typeName, ok := item.Meta["type"].(string)
if !ok { if !ok {
continue continue
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment