mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
compatible with previous json rendering
This commit is contained in:
parent
c546c309f1
commit
95fe745a0c
|
@ -46,25 +46,35 @@ func (fs *FilerServer) listDirectoryHandler(w http.ResponseWriter, r *http.Reque
|
||||||
|
|
||||||
glog.V(4).Infof("listDirectory %s, last file %s, limit %d: %d items", path, lastFileName, limit, len(entries))
|
glog.V(4).Infof("listDirectory %s, last file %s, limit %d: %d items", path, lastFileName, limit, len(entries))
|
||||||
|
|
||||||
args := struct {
|
|
||||||
Path string
|
|
||||||
Breadcrumbs []ui.Breadcrumb
|
|
||||||
Entries interface{}
|
|
||||||
Limit int
|
|
||||||
LastFileName string
|
|
||||||
ShouldDisplayLoadMore bool
|
|
||||||
}{
|
|
||||||
path,
|
|
||||||
ui.ToBreadcrumb(path),
|
|
||||||
entries,
|
|
||||||
limit,
|
|
||||||
lastFileName,
|
|
||||||
shouldDisplayLoadMore,
|
|
||||||
}
|
|
||||||
|
|
||||||
if r.Header.Get("Accept") == "application/json" {
|
if r.Header.Get("Accept") == "application/json" {
|
||||||
writeJsonQuiet(w, r, http.StatusOK, args)
|
writeJsonQuiet(w, r, http.StatusOK, struct {
|
||||||
|
Path string
|
||||||
|
Entries interface{}
|
||||||
|
Limit int
|
||||||
|
LastFileName string
|
||||||
|
ShouldDisplayLoadMore bool
|
||||||
|
}{
|
||||||
|
path,
|
||||||
|
entries,
|
||||||
|
limit,
|
||||||
|
lastFileName,
|
||||||
|
shouldDisplayLoadMore,
|
||||||
|
})
|
||||||
} else {
|
} else {
|
||||||
ui.StatusTpl.Execute(w, args)
|
ui.StatusTpl.Execute(w, struct {
|
||||||
|
Path string
|
||||||
|
Breadcrumbs []ui.Breadcrumb
|
||||||
|
Entries interface{}
|
||||||
|
Limit int
|
||||||
|
LastFileName string
|
||||||
|
ShouldDisplayLoadMore bool
|
||||||
|
}{
|
||||||
|
path,
|
||||||
|
ui.ToBreadcrumb(path),
|
||||||
|
entries,
|
||||||
|
limit,
|
||||||
|
lastFileName,
|
||||||
|
shouldDisplayLoadMore,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue