apply suggestions from code review

- show title when the lfs size isn't zero
- merge `Add64` and `Add` helper function

Signed-off-by: a1012112796 <[email protected]>

Author: a1012112796

modules/templates/helper.go

@@ -120,18 +120,22 @@ func NewFuncMap() []template.FuncMap {
 		"Subtract":       base.Subtract,
 		"EntryIcon":      base.EntryIcon,
 		"MigrationIcon":  MigrationIcon,
-		"Add": func(a ...int) int {
-			sum := 0
-			for _, val := range a {
-				sum += val
-			}
-			return sum
-		},
-		"Add64": func(a ...int64) int64 {
+		"Add": func(a ...interface{}) int64 {
 			sum := int64(0)
+
 			for _, val := range a {
-				sum += val
+				switch v := val.(type) {
+				case int:
+					sum += int64(v)
+				case int32:
+					sum += int64(v)
+				case int64:
+					sum += v
+				default:
+					return -1
+				}
 			}
+
 			return sum
 		},
 		"Mul": func(a ...int) int {

templates/repo/settings/options.tmpl

@@ -16,9 +16,9 @@
 					<label for="repo_name">{{.locale.Tr "repo.repo_name"}}</label>
 					<input id="repo_name" name="repo_name" value="{{.Repository.Name}}" data-repo-name="{{.Repository.Name}}" autofocus required>
 				</div>
-				<div class="inline field" title="git: {{FileSize .Repository.Size}}, lfs: {{FileSize .Repository.LFSSize}}">
+				<div class="inline field" {{if not (eq .Repository.LFSSize 0)}}title="git: {{FileSize .Repository.Size}}, lfs: {{FileSize .Repository.LFSSize}}"{{end}}>
 					<label>{{.locale.Tr "repo.repo_size"}}</label>
-					<span>{{FileSize (Add64 .Repository.Size .Repository.LFSSize)}}</span>
+					<span>{{FileSize (Add .Repository.Size .Repository.LFSSize)}}</span>
 				</div>
 				<div class="inline field">
 					<label>{{.locale.Tr "repo.template"}}</label>

templates/repo/sub_menu.tmpl

@@ -15,9 +15,9 @@
 					</div>
 				{{end}}
 				<div class="item">
-					<span class="ui" title="git: {{FileSize .Repository.Size}}, lfs: {{FileSize .Repository.LFSSize}}">
+					<span class="ui" {{if not (eq .Repository.LFSSize 0)}}title="git: {{FileSize .Repository.Size}}, lfs: {{FileSize .Repository.LFSSize}}"{{end}}>
 						{{svg "octicon-database"}}
-						<b>{{FileSize (Add64 .Repository.Size .Repository.LFSSize)}}</b>
+						<b>{{FileSize (Add .Repository.Size .Repository.LFSSize)}}</b>
 					</span>
 				</div>
 			{{end}}

templates/user/settings/repos.tmpl

@@ -27,8 +27,8 @@
 											<span class="icon">{{svg "octicon-repo"}}</span>
 										{{end}}
 										<a class="name" href="{{$repo.Link}}">{{$repo.OwnerName}}/{{$repo.Name}}</a>
-										<span  title="git: {{FileSize $repo.Size}}, lfs: {{FileSize $repo.LFSSize}}">
-											{{FileSize (Add64 $repo.Size $repo.LFSSize)}}
+										<span  {{if not (eq $repo.LFSSize 0)}}title="git: {{FileSize $repo.Size}}, lfs: {{FileSize $repo.LFSSize}}"{{end}}>
+											{{FileSize (Add $repo.Size $repo.LFSSize)}}
 										</span>
 										{{if $repo.IsFork}}
 											{{$.locale.Tr "repo.forked_from"}}