worldcone/forgejo
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix config ui error about cache ttl (#6861)

Browse source
This commit is contained in:
Lunny Xiao 2019-05-06 22:35:11 +08:00 committed by Lauris BH
parent 5d5eae6aea
commit 01ebd52a1f
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
options/locale/locale_en-US.ini
View file

@ -1757,6 +1757,7 @@ config.cache_config = Cache Configuration
config.cache_adapter = Cache Adapter config.cache_adapter = Cache Adapter
config.cache_interval = Cache Interval config.cache_interval = Cache Interval
config.cache_conn = Cache Connection config.cache_conn = Cache Connection
config.cache_item_ttl = Cache Item TTL
config.session_config = Session Configuration config.session_config = Session Configuration
config.session_provider = Session Provider config.session_provider = Session Provider

1
routers/admin/admin.go
View file

@ -234,6 +234,7 @@ func Config(ctx *context.Context) {
ctx.Data["CacheAdapter"] = setting.CacheService.Adapter ctx.Data["CacheAdapter"] = setting.CacheService.Adapter
ctx.Data["CacheInterval"] = setting.CacheService.Interval ctx.Data["CacheInterval"] = setting.CacheService.Interval
ctx.Data["CacheConn"] = setting.CacheService.Conn ctx.Data["CacheConn"] = setting.CacheService.Conn
ctx.Data["CacheItemTTL"] = setting.CacheService.TTL
ctx.Data["SessionConfig"] = setting.SessionConfig ctx.Data["SessionConfig"] = setting.SessionConfig

4
templates/admin/config.tmpl
View file

@ -233,11 +233,15 @@
<dl class="dl-horizontal admin-dl-horizontal"> <dl class="dl-horizontal admin-dl-horizontal">
<dt>{{.i18n.Tr "admin.config.cache_adapter"}}</dt> <dt>{{.i18n.Tr "admin.config.cache_adapter"}}</dt>
<dd>{{.CacheAdapter}}</dd> <dd>{{.CacheAdapter}}</dd>
{{if eq .CacheAdapter "memory"}}
<dt>{{.i18n.Tr "admin.config.cache_interval"}}</dt> <dt>{{.i18n.Tr "admin.config.cache_interval"}}</dt>
<dd>{{.CacheInterval}} {{.i18n.Tr "tool.raw_seconds"}}</dd> <dd>{{.CacheInterval}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
{{end}}
{{if .CacheConn}} {{if .CacheConn}}
<dt>{{.i18n.Tr "admin.config.cache_conn"}}</dt> <dt>{{.i18n.Tr "admin.config.cache_conn"}}</dt>
<dd><code>{{.CacheConn}}</code></dd> <dd><code>{{.CacheConn}}</code></dd>
<dt>{{.i18n.Tr "admin.config.cache_item_ttl"}}</dt>
<dd><code>{{.CacheItemTTL}}</code></dd>
{{end}} {{end}}
</dl> </dl>
</div> </div>