diff options
| author | chrislu <chris.lu@gmail.com> | 2024-07-02 23:55:48 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-07-02 23:55:48 -0700 |
| commit | 62c29b2398fcdccfff57d433b14e18e1a249b0ab (patch) | |
| tree | f0b07a48f0d16c452faaa8e099d921d3a814fed1 | |
| parent | 761a1555de2a114a525ddf1c30435f13bab76c84 (diff) | |
| download | seaweedfs-62c29b2398fcdccfff57d433b14e18e1a249b0ab.tar.xz seaweedfs-62c29b2398fcdccfff57d433b14e18e1a249b0ab.zip | |
Revert "directory can paginate"
This reverts commit 69003d0e906e098cf6db11da05d915d0718a5eba.
| -rw-r--r-- | weed/server/filer_ui/filer.html | 3 | ||||
| -rw-r--r-- | weed/server/filer_ui/templates.go | 12 |
2 files changed, 4 insertions, 11 deletions
diff --git a/weed/server/filer_ui/filer.html b/weed/server/filer_ui/filer.html index 149d57647..fa5cdd4e8 100644 --- a/weed/server/filer_ui/filer.html +++ b/weed/server/filer_ui/filer.html @@ -116,14 +116,13 @@ {{ else }} <table width="100%" class="table table-hover"> {{ $path := .Path }} - {{ $limit := .Limit }} {{ $showDirDel := .ShowDirectoryDelete }} {{ range $entry_index, $entry := .Entries }} <tr> <td> {{ if $entry.IsDirectory }} <span class="glyphicon glyphicon-folder-open" aria-hidden="true"></span> - <a href="{{ printpath $path "/" $entry.Name "/" "?" "limit" "=" }}{{ print $limit }}" > + <a href="{{ printpath $path "/" $entry.Name "/"}}" > {{ $entry.Name }} </a> {{ else }} diff --git a/weed/server/filer_ui/templates.go b/weed/server/filer_ui/templates.go index 4a1822d7e..f9ef064bc 100644 --- a/weed/server/filer_ui/templates.go +++ b/weed/server/filer_ui/templates.go @@ -9,15 +9,9 @@ import ( ) func printpath(parts ...string) string { - var escapedParts []string - for _, p := range parts { - if len(p) == 1 { - escapedParts = append(escapedParts, p) - } else { - escapedParts = append(escapedParts, url.PathEscape(p)) - } - } - return strings.Join(escapedParts, "") + concat := strings.Join(parts, "") + escaped := url.PathEscape(concat) + return strings.ReplaceAll(escaped, "%2F", "/") } var funcMap = template.FuncMap{ |