Skip to content

Commit 211596f

Browse files
unknwonunknwon
committed
gogs#1124 LDAP add and edit form are misleading
1 parent 9c67a19 commit 211596f

File tree

4 files changed

+57
-45
lines changed

4 files changed

+57
-45
lines changed

‎modules/auth/auth_form.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@ import (
1010
)
1111

1212
type AuthenticationForm struct {
13-
Id int64 `form:"id"`
14-
Type int `form:"type"`
15-
AuthName string `form:"name" binding:"Required;MaxSize(50)"`
16-
Domain string `form:"domain"`
17-
Host string `form:"host"`
18-
Port int `form:"port"`
13+
ID int64 `form:"id"`
14+
Type int
15+
Name string `binding:"Required;MaxSize(50)"`
16+
Domain string
17+
Host string
18+
Port int
1919
UseSSL bool `form:"usessl"`
2020
BaseDN string `form:"base_dn"`
21-
AttributeUsername string `form:"attribute_username"`
22-
AttributeName string `form:"attribute_name"`
23-
AttributeSurname string `form:"attribute_surname"`
24-
AttributeMail string `form:"attribute_mail"`
25-
Filter string `form:"filter"`
21+
AttributeUsername string
22+
AttributeName string
23+
AttributeSurname string
24+
AttributeMail string
25+
Filter string
2626
MsAdSA string `form:"ms_ad_sa"`
27-
IsActived bool `form:"is_actived"`
28-
SmtpAuth string `form:"smtpauth"`
29-
SmtpHost string `form:"smtphost"`
30-
SmtpPort int `form:"smtpport"`
31-
Tls bool `form:"tls"`
27+
IsActived bool
28+
SMTPAuth string `form:"smtp_auth"`
29+
SMTPHost string `form:"smtp_host"`
30+
SMTPPort int `form:"smtp_port"`
31+
TLS bool `form:"tls"`
3232
AllowAutoRegister bool `form:"allowautoregister"`
3333
}
3434

‎routers/admin/auths.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ func NewAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
7474
Filter: form.Filter,
7575
MsAdSAFormat: form.MsAdSA,
7676
Enabled: true,
77-
Name: form.AuthName,
77+
Name: form.Name,
7878
},
7979
}
8080
case models.SMTP:
8181
u = &models.SMTPConfig{
82-
Auth: form.SmtpAuth,
83-
Host: form.SmtpHost,
84-
Port: form.SmtpPort,
85-
TLS: form.Tls,
82+
Auth: form.SMTPAuth,
83+
Host: form.SMTPHost,
84+
Port: form.SMTPPort,
85+
TLS: form.TLS,
8686
}
8787
default:
8888
ctx.Error(400)
@@ -91,7 +91,7 @@ func NewAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
9191

9292
var source = &models.LoginSource{
9393
Type: models.LoginType(form.Type),
94-
Name: form.AuthName,
94+
Name: form.Name,
9595
IsActived: true,
9696
AllowAutoRegister: form.AllowAutoRegister,
9797
Cfg: u,
@@ -102,7 +102,7 @@ func NewAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
102102
return
103103
}
104104

105-
log.Trace("Authentication created by admin(%s): %s", ctx.User.Name, form.AuthName)
105+
log.Trace("Authentication created by admin(%s): %s", ctx.User.Name, form.Name)
106106
ctx.Redirect(setting.AppSubUrl + "/admin/auths")
107107
}
108108

@@ -156,24 +156,24 @@ func EditAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
156156
Filter: form.Filter,
157157
MsAdSAFormat: form.MsAdSA,
158158
Enabled: true,
159-
Name: form.AuthName,
159+
Name: form.Name,
160160
},
161161
}
162162
case models.SMTP:
163163
config = &models.SMTPConfig{
164-
Auth: form.SmtpAuth,
165-
Host: form.SmtpHost,
166-
Port: form.SmtpPort,
167-
TLS: form.Tls,
164+
Auth: form.SMTPAuth,
165+
Host: form.SMTPHost,
166+
Port: form.SMTPPort,
167+
TLS: form.TLS,
168168
}
169169
default:
170170
ctx.Error(400)
171171
return
172172
}
173173

174174
u := models.LoginSource{
175-
Id: form.Id,
176-
Name: form.AuthName,
175+
Id: form.ID,
176+
Name: form.Name,
177177
IsActived: form.IsActived,
178178
Type: models.LoginType(form.Type),
179179
AllowAutoRegister: form.AllowAutoRegister,
@@ -185,7 +185,7 @@ func EditAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
185185
return
186186
}
187187

188-
log.Trace("Authentication changed by admin(%s): %s", ctx.User.Name, form.AuthName)
188+
log.Trace("Authentication changed by admin(%s): %s", ctx.User.Name, form.Name)
189189
ctx.Flash.Success(ctx.Tr("admin.auths.update_success"))
190190
ctx.Redirect(setting.AppSubUrl + "/admin/auths/" + ctx.Params(":authid"))
191191
}

‎templates/admin/auth/edit.tmpl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@
5252
<input class="ipt ipt-large ipt-radius {{if .Err_Attributes}}ipt-error{{end}}" id="attribute_username" name="attribute_username" value="{{.Source.LDAP.AttributeUsername}}" />
5353
</div>
5454
<div class="field">
55-
<label class="req" for="attribute_name">{{.i18n.Tr "admin.auths.attribute_name"}}</label>
55+
<label for="attribute_name">{{.i18n.Tr "admin.auths.attribute_name"}}</label>
5656
<input class="ipt ipt-large ipt-radius {{if .Err_Attributes}}ipt-error{{end}}" id="attribute_name" name="attribute_name" value="{{.Source.LDAP.AttributeName}}" />
5757
</div>
5858
<div class="field">
59-
<label class="req" for="attribute_surname">{{.i18n.Tr "admin.auths.attribute_surname"}}</label>
59+
<label for="attribute_surname">{{.i18n.Tr "admin.auths.attribute_surname"}}</label>
6060
<input class="ipt ipt-large ipt-radius {{if .Err_Attributes}}ipt-error{{end}}" id="attribute_surname" name="attribute_surname" value="{{.Source.LDAP.AttributeSurname}}" />
6161
</div>
6262
<div class="field">
@@ -75,7 +75,7 @@
7575
{{else if eq $type 3}}
7676
<div class="field">
7777
<label class="req">{{.i18n.Tr "admin.auths.smtp_auth"}}</label>
78-
<select name="smtpauth">
78+
<select name="smtp_auth">
7979
{{$auth := .Source.SMTP.Auth}}
8080
{{range .SMTPAuths}}
8181
<option value="{{.}}"
@@ -84,12 +84,12 @@
8484
</select>
8585
</div>
8686
<div class="field">
87-
<label class="req" for="smtphost">{{.i18n.Tr "admin.auths.smtphost"}}</label>
88-
<input class="ipt ipt-large ipt-radius {{if .Err_SmtpHost}}ipt-error{{end}}" id="smtphost" name="smtphost" value="{{.Source.SMTP.Host}}" />
87+
<label class="req" for="smtp_host">{{.i18n.Tr "admin.auths.smtphost"}}</label>
88+
<input class="ipt ipt-large ipt-radius {{if .Err_SmtpHost}}ipt-error{{end}}" id="smtp_host" name="smtp_host" value="{{.Source.SMTP.Host}}" />
8989
</div>
9090
<div class="field">
91-
<label class="req" for="smtpport">{{.i18n.Tr "admin.auths.smtpport"}}</label>
92-
<input class="ipt ipt-large ipt-radius {{if .Err_SmtpPort}}ipt-error{{end}}" id="smtpport" name="smtpport" value="{{.Source.SMTP.Port}}" />
91+
<label class="req" for="smtp_port">{{.i18n.Tr "admin.auths.smtpport"}}</label>
92+
<input class="ipt ipt-large ipt-radius {{if .Err_SmtpPort}}ipt-error{{end}}" id="smtp_port" name="smtp_port" value="{{.Source.SMTP.Port}}" />
9393
</div>
9494
{{end}}
9595

‎templates/admin/auth/new.tmpl

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,20 @@
4444
<input class="ipt ipt-large ipt-radius {{if .Err_BaseDN}}ipt-error{{end}}" id="base_dn" name="base_dn" value="{{.base_dn}}" />
4545
</div>
4646
<div class="field">
47-
<label class="req" for="attributes">{{.i18n.Tr "admin.auths.attributes"}}</label>
48-
<input class="ipt ipt-large ipt-radius {{if .Err_Attributes}}ipt-error{{end}}" id="attributes" name="attributes" value="{{.attributes}}" />
47+
<label class="req" for="attribute_username">{{.i18n.Tr "admin.auths.attribute_username"}}</label>
48+
<input class="ipt ipt-large ipt-radius {{if .Err_AttributeUsername}}ipt-error{{end}}" id="attribute_username" name="attribute_username" value="{{.attribute_username}}" />
49+
</div>
50+
<div class="field">
51+
<label for="attribute_name">{{.i18n.Tr "admin.auths.attribute_name"}}</label>
52+
<input class="ipt ipt-large ipt-radius {{if .Err_AttributeName}}ipt-error{{end}}" id="attribute_name" name="attribute_name" value="{{.attribute_name}}" />
53+
</div>
54+
<div class="field">
55+
<label for="attribute_surname">{{.i18n.Tr "admin.auths.attribute_surname"}}</label>
56+
<input class="ipt ipt-large ipt-radius {{if .Err_AttributeSurname}}ipt-error{{end}}" id="attribute_surname" name="attribute_surname" value="{{.attribute_surname}}" />
57+
</div>
58+
<div class="field">
59+
<label class="req" for="attribute_mail">{{.i18n.Tr "admin.auths.attribute_mail"}}</label>
60+
<input class="ipt ipt-large ipt-radius {{if .Err_AttributeMail}}ipt-error{{end}}" id="attribute_mail" name="attribute_mail" value="{{.attribute_mail}}" />
4961
</div>
5062
<div class="field">
5163
<label class="req" for="filter">{{.i18n.Tr "admin.auths.filter"}}</label>
@@ -59,19 +71,19 @@
5971
<div class="smtp hidden">
6072
<div class="field">
6173
<label class="req">{{.i18n.Tr "admin.auths.smtp_auth"}}</label>
62-
<select name="smtpauth">
74+
<select name="smtp_auth">
6375
{{range .SMTPAuths}}
6476
<option value="{{.}}">{{.}}</option>
6577
{{end}}
6678
</select>
6779
</div>
6880
<div class="field">
69-
<label class="req" for="smtphost">{{.i18n.Tr "admin.auths.smtphost"}}</label>
70-
<input class="ipt ipt-large ipt-radius {{if .Err_SmtpHost}}ipt-error{{end}}" id="smtphost" name="smtphost" value="{{.smtphost}}" />
81+
<label class="req" for="smtp_host">{{.i18n.Tr "admin.auths.smtphost"}}</label>
82+
<input class="ipt ipt-large ipt-radius {{if .Err_SmtpHost}}ipt-error{{end}}" id="smtp_host" name="smtp_host" value="{{.smtp_host}}" />
7183
</div>
7284
<div class="field">
73-
<label class="req" for="smtpport">{{.i18n.Tr "admin.auths.smtpport"}}</label>
74-
<input class="ipt ipt-large ipt-radius {{if .Err_SmtpPort}}ipt-error{{end}}" id="smtpport" name="smtpport" value="{{.smtpport}}" />
85+
<label class="req" for="smtp_port">{{.i18n.Tr "admin.auths.smtpport"}}</label>
86+
<input class="ipt ipt-large ipt-radius {{if .Err_SmtpPort}}ipt-error{{end}}" id="smtp_port" name="smtp_port" value="{{.smtp_port}}" />
7587
</div>
7688
</div>
7789
<div class="field">

0 commit comments

Comments
 (0)