mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity

Show correct SSL Mode on "install page" (#25818) (#25838) 

Backport #25818 by @wxiaoguang

Fix #25817


![image](https://github.com/go-gitea/gitea/assets/2114189/49f7b85d-c229-41b5-86fd-58cd812eaca6)

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
Giteabot 2023-07-12 02:01:38 -04:00 committed by GitHub
parent 052e65e63f
commit abe9c641ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
routers/install/install.go
View File

@ -102,6 +102,7 @@ func Install(ctx *context.Context) {
form.DbName = setting.Database.Name form.DbName = setting.Database.Name
form.DbPath = setting.Database.Path form.DbPath = setting.Database.Path
form.DbSchema = setting.Database.Schema form.DbSchema = setting.Database.Schema
form.SSLMode = setting.Database.SSLMode
curDBType := setting.Database.Type.String() curDBType := setting.Database.Type.String()
var isCurDBTypeSupported bool var isCurDBTypeSupported bool

6
templates/install.tmpl
View File

@ -28,7 +28,7 @@
</div> </div>
</div> </div>
<div class="gt-hidden" data-db-setting-for="common-host"> <div class="gt-mt-4 gt-hidden" data-db-setting-for="common-host">
<div class="inline required field {{if .Err_DbSetting}}error{{end}}"> <div class="inline required field {{if .Err_DbSetting}}error{{end}}">
<label for="db_host">{{.locale.Tr "install.host"}}</label> <label for="db_host">{{.locale.Tr "install.host"}}</label>
<input id="db_host" name="db_host" value="{{.db_host}}"> <input id="db_host" name="db_host" value="{{.db_host}}">
@ -47,7 +47,7 @@
</div> </div>
</div> </div>
<div class="gt-hidden" data-db-setting-for="postgres"> <div class="gt-mt-4 gt-hidden" data-db-setting-for="postgres">
<div class="inline required field"> <div class="inline required field">
<label>{{.locale.Tr "install.ssl_mode"}}</label> <label>{{.locale.Tr "install.ssl_mode"}}</label>
<div class="ui selection database type dropdown"> <div class="ui selection database type dropdown">
@ -68,7 +68,7 @@
</div> </div>
</div> </div>
<div class="gt-hidden" data-db-setting-for="sqlite3"> <div class="gt-mt-4 gt-hidden" data-db-setting-for="sqlite3">
<div class="inline required field {{if or .Err_DbPath .Err_DbSetting}}error{{end}}"> <div class="inline required field {{if or .Err_DbPath .Err_DbSetting}}error{{end}}">
<label for="db_path">{{.locale.Tr "install.path"}}</label> <label for="db_path">{{.locale.Tr "install.path"}}</label>
<input id="db_path" name="db_path" value="{{.db_path}}"> <input id="db_path" name="db_path" value="{{.db_path}}">