Fix false login state on OAuth signup page
Having a `Username` field populated in the page data tells the base template to display navigation that only a logged in user should see. So this renames the field to `LoginUsername`, similar to our login.tmpl page. Ref T712
This commit is contained in:
parent
33a6129d1e
commit
4d5c89e7ef
|
@ -29,9 +29,9 @@ type viewOauthSignupVars struct {
|
||||||
ClientID string
|
ClientID string
|
||||||
TokenHash string
|
TokenHash string
|
||||||
|
|
||||||
Username string
|
LoginUsername string
|
||||||
Alias string
|
Alias string
|
||||||
Email string
|
Email string
|
||||||
}
|
}
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -184,9 +184,9 @@ func (h oauthHandler) showOauthSignupPage(app *App, w http.ResponseWriter, r *ht
|
||||||
ClientID: tp.ClientID,
|
ClientID: tp.ClientID,
|
||||||
TokenHash: tp.TokenHash,
|
TokenHash: tp.TokenHash,
|
||||||
|
|
||||||
Username: username,
|
LoginUsername: username,
|
||||||
Alias: alias,
|
Alias: collTitle,
|
||||||
Email: email,
|
Email: email,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Display any error messages
|
// Display any error messages
|
||||||
|
|
|
@ -85,7 +85,7 @@ form dd {
|
||||||
<label>
|
<label>
|
||||||
<dt>Username</dt>
|
<dt>Username</dt>
|
||||||
<dd>
|
<dd>
|
||||||
<input type="text" id="username" name="username" style="width: 100%; box-sizing: border-box;" placeholder="Username" value="{{.Username}}" /><br />
|
<input type="text" id="username" name="username" style="width: 100%; box-sizing: border-box;" placeholder="Username" value="{{.LoginUsername}}" /><br />
|
||||||
{{if .Federation}}<p id="alias-site" class="demo">@<strong>your-username</strong>@{{.FriendlyHost}}</p>{{else}}<p id="alias-site" class="demo">{{.FriendlyHost}}/<strong>your-username</strong></p>{{end}}
|
{{if .Federation}}<p id="alias-site" class="demo">@<strong>your-username</strong>@{{.FriendlyHost}}</p>{{else}}<p id="alias-site" class="demo">{{.FriendlyHost}}/<strong>your-username</strong></p>{{end}}
|
||||||
</dd>
|
</dd>
|
||||||
</label>
|
</label>
|
||||||
|
|
Loading…
Reference in New Issue