diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2019-05-06 22:35:11 +0800 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-05-06 17:35:11 +0300 |
| commit | 01ebd52a1fa2a5a71ff6609f04c3338e7e4795d4 (patch) | |
| tree | 5209d0d7b10a2e277e64465982e855d53279e162 | |
| parent | 5d5eae6aea258093379be6eab0a83b518e67d446 (diff) | |
| download | gitea-01ebd52a1fa2a5a71ff6609f04c3338e7e4795d4.tar.gz gitea-01ebd52a1fa2a5a71ff6609f04c3338e7e4795d4.zip | |
fix config ui error about cache ttl (#6861)
| -rw-r--r-- | options/locale/locale_en-US.ini | 1 | ||||
| -rw-r--r-- | routers/admin/admin.go | 1 | ||||
| -rw-r--r-- | templates/admin/config.tmpl | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 9af1f80669..d2cd1e6642 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1757,6 +1757,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 92df194b78..7b8422fc61 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -234,6 +234,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 23a68caa8e..b4fcb4d610 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -233,11 +233,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> |