Skip to content

Commit 01ebd52

Browse files
lunnylafriks
authored andcommitted
fix config ui error about cache ttl (#6861)
1 parent 5d5eae6 commit 01ebd52

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

options/locale/locale_en-US.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1757,6 +1757,7 @@ config.cache_config = Cache Configuration
17571757
config.cache_adapter = Cache Adapter
17581758
config.cache_interval = Cache Interval
17591759
config.cache_conn = Cache Connection
1760+
config.cache_item_ttl = Cache Item TTL
17601761
17611762
config.session_config = Session Configuration
17621763
config.session_provider = Session Provider

routers/admin/admin.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ func Config(ctx *context.Context) {
234234
ctx.Data["CacheAdapter"] = setting.CacheService.Adapter
235235
ctx.Data["CacheInterval"] = setting.CacheService.Interval
236236
ctx.Data["CacheConn"] = setting.CacheService.Conn
237+
ctx.Data["CacheItemTTL"] = setting.CacheService.TTL
237238

238239
ctx.Data["SessionConfig"] = setting.SessionConfig
239240

templates/admin/config.tmpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,11 +233,15 @@
233233
<dl class="dl-horizontal admin-dl-horizontal">
234234
<dt>{{.i18n.Tr "admin.config.cache_adapter"}}</dt>
235235
<dd>{{.CacheAdapter}}</dd>
236+
{{if eq .CacheAdapter "memory"}}
236237
<dt>{{.i18n.Tr "admin.config.cache_interval"}}</dt>
237238
<dd>{{.CacheInterval}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
239+
{{end}}
238240
{{if .CacheConn}}
239241
<dt>{{.i18n.Tr "admin.config.cache_conn"}}</dt>
240242
<dd><code>{{.CacheConn}}</code></dd>
243+
<dt>{{.i18n.Tr "admin.config.cache_item_ttl"}}</dt>
244+
<dd><code>{{.CacheItemTTL}}</code></dd>
241245
{{end}}
242246
</dl>
243247
</div>

0 commit comments

Comments
 (0)