From d4550508160f438adbfd033f66f5fd3a61da3308 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Mon, 6 May 2019 22:35:11 +0800
Subject: [PATCH] fix config ui error about cache ttl (#6861)

---
 options/locale/locale_en-US.ini | 1 +
 routers/admin/admin.go          | 1 +
 templates/admin/config.tmpl     | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 703942af7701..4f6f5d4745dd 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1706,6 +1706,7 @@ config.cache_config = Cache Configuration
 config.cache_adapter = Cache Adapter
 config.cache_interval = Cache Interval
 config.cache_conn = Cache Connection
+config.cache_item_ttl = Cache Item TTL
 
 config.session_config = Session Configuration
 config.session_provider = Session Provider
diff --git a/routers/admin/admin.go b/routers/admin/admin.go
index 7d98e1af36b8..fa895b600cf3 100644
--- a/routers/admin/admin.go
+++ b/routers/admin/admin.go
@@ -232,6 +232,7 @@ func Config(ctx *context.Context) {
 	ctx.Data["CacheAdapter"] = setting.CacheService.Adapter
 	ctx.Data["CacheInterval"] = setting.CacheService.Interval
 	ctx.Data["CacheConn"] = setting.CacheService.Conn
+	ctx.Data["CacheItemTTL"] = setting.CacheService.TTL
 
 	ctx.Data["SessionConfig"] = setting.SessionConfig
 
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index becaca61e541..e65419d476cc 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -222,11 +222,15 @@
 			<dl class="dl-horizontal admin-dl-horizontal">
 				<dt>{{.i18n.Tr "admin.config.cache_adapter"}}</dt>
 				<dd>{{.CacheAdapter}}</dd>
+				{{if eq .CacheAdapter "memory"}}
 				<dt>{{.i18n.Tr "admin.config.cache_interval"}}</dt>
 				<dd>{{.CacheInterval}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
+				{{end}}
 				{{if .CacheConn}}
 				<dt>{{.i18n.Tr "admin.config.cache_conn"}}</dt>
 				<dd><code>{{.CacheConn}}</code></dd>
+				<dt>{{.i18n.Tr "admin.config.cache_item_ttl"}}</dt>
+				<dd><code>{{.CacheItemTTL}}</code></dd>
 				{{end}}
 			</dl>
 		</div>