feat(tpls): only show delete button if available

Author: marjune163

src/serverHandler/page.go

@@ -34,7 +34,11 @@ func updateSubItemsHtml(data *responseData) {
 
 		var deleteUrl string
 		if data.CanDelete {
-			deleteUrl = data.SubItemPrefix + "?delete&name=" + name
+			_, isRenamedInfo := info.(*renamedFileInfo)
+			_, isFakeInfo := info.(*fakeFileInfo)
+			if !isRenamedInfo && !isFakeInfo {
+				deleteUrl = data.SubItemPrefix + "?delete&name=" + name
+			}
 		}
 
 		data.SubItemsHtml[i] = &itemHtml{

src/serverHandler/responseData.go

@@ -43,12 +43,13 @@ type responseData struct {
 	SubItemsHtml  []*itemHtml
 	SubItemPrefix string
 
-	CanUpload  bool
-	CanMkdir   bool
-	CanDelete  bool
-	CanArchive bool
-	CanCors    bool
-	NeedAuth   bool
+	CanUpload    bool
+	CanMkdir     bool
+	CanDelete    bool
+	HasDeletable bool
+	CanArchive   bool
+	CanCors      bool
+	NeedAuth     bool
 }
 
 func isSlash(c rune) bool {
@@ -332,6 +333,7 @@ func (h *handler) getResponseData(r *http.Request) (data *responseData) {
 	canUpload := h.getCanUpload(item, rawReqPath, reqFsPath)
 	canMkdir := h.getCanMkdir(item, rawReqPath, reqFsPath)
 	canDelete := h.getCanDelete(item, rawReqPath, reqFsPath)
+	hasDeletable := canDelete && len(subItems) > len(aliasSubItems)
 	canArchive := h.getCanArchive(subItems, rawReqPath, reqFsPath)
 	canCors := h.getCanCors(rawReqPath, reqFsPath)
 	needAuth := h.getNeedAuth(rawReqPath, reqFsPath)
@@ -355,12 +357,13 @@ func (h *handler) getResponseData(r *http.Request) (data *responseData) {
 		SubItemsHtml:  nil,
 		SubItemPrefix: subItemPrefix,
 
-		CanUpload:  canUpload,
-		CanMkdir:   canMkdir,
-		CanDelete:  canDelete,
-		CanArchive: canArchive,
-		CanCors:    canCors,
-		NeedAuth:   needAuth,
+		CanUpload:    canUpload,
+		CanMkdir:     canMkdir,
+		CanDelete:    canDelete,
+		HasDeletable: hasDeletable,
+		CanArchive:   canArchive,
+		CanCors:      canCors,
+		NeedAuth:     needAuth,
 	}
 
 	return

src/tpl/assert/main.css

@@ -212,7 +212,7 @@ em {
 	zoom: 1;
 }
 
-.can-delete .link {
+.has-deletable .link {
 	padding-right: 2.2em;
 }
 

src/tpl/assert/main.css.go

@@ -182,7 +182,7 @@ border-bottom: 1px #f5f5f5 solid;
 overflow: hidden;
 zoom: 1;
 }
-.can-delete .link {
+.has-deletable .link {
 padding-right: 2.2em;
 }
 .item-list .name {

src/tpl/page.html

@@ -44,8 +44,7 @@
 	</div>
 {{end}}
 
-{{$canDelete := .CanDelete}}
-{{if $canDelete}}
+{{if .CanDelete}}
 	<script type="text/javascript">
 		function confirmDelete(el) {
 			var href = el.href;
@@ -54,7 +53,7 @@
 		}
 	</script>
 {{end}}
-<ul class="item-list{{if $canDelete}} can-delete{{end}}">
+<ul class="item-list{{if .HasDeletable}} has-deletable{{end}}">
 	<li class="dir parent">
 		<a href="{{if .IsRoot}}./{{else}}../{{end}}" class="link">
 			<span class="name">../</span>
@@ -69,7 +68,7 @@
 				<span class="size">{{.DisplaySize}}</span>
 				<span class="time">{{.DisplayTime}}</span>
 			</a>
-			{{if $canDelete}}<a href="{{.DeleteUrl}}" class="delete" onclick="return confirmDelete(this)"><span>x</span></a>{{end}}
+			{{if .DeleteUrl}}<a href="{{.DeleteUrl}}" class="delete" onclick="return confirmDelete(this)"><span>x</span></a>{{end}}
 		</li>
 	{{end}}
 </ul>

src/tpl/page.html.go

@@ -49,8 +49,7 @@ const pageTplStr = `
 <a href="{{.SubItemPrefix}}?zip" download="{{.ItemName}}.zip">.zip</a>
 </div>
 {{end}}
-{{$canDelete := .CanDelete}}
-{{if $canDelete}}
+{{if .CanDelete}}
 <script type="text/javascript">
 function confirmDelete(el) {
 var href = el.href;
@@ -59,7 +58,7 @@ return confirm('Delete?\n' + name);
 }
 </script>
 {{end}}
-<ul class="item-list{{if $canDelete}} can-delete{{end}}">
+<ul class="item-list{{if .HasDeletable}} has-deletable{{end}}">
 <li class="dir parent">
 <a href="{{if .IsRoot}}./{{else}}../{{end}}" class="link">
 <span class="name">../</span>
@@ -74,7 +73,7 @@ return confirm('Delete?\n' + name);
 <span class="size">{{.DisplaySize}}</span>
 <span class="time">{{.DisplayTime}}</span>
 </a>
-{{if $canDelete}}<a href="{{.DeleteUrl}}" class="delete" onclick="return confirmDelete(this)"><span>x</span></a>{{end}}
+{{if .DeleteUrl}}<a href="{{.DeleteUrl}}" class="delete" onclick="return confirmDelete(this)"><span>x</span></a>{{end}}
 </li>
 {{end}}
 </ul>