mirror of
https://github.com/go-gitea/gitea
synced 2024-11-14 05:51:33 +01:00
7fc5fd6415
If the mailer is configured then even if Manual confirm is set an activation email is still being sent because `handleUserCreated` is not checking for this case. Fix #17263 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
50 lines
2 KiB
Handlebars
50 lines
2 KiB
Handlebars
{{template "base/head" .}}
|
|
<div class="page-content user activate">
|
|
<div class="ui middle very relaxed page grid">
|
|
<div class="column">
|
|
<form class="ui form ignore-dirty" action="{{AppSubUrl}}/user/activate" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
<h2 class="ui top attached header">
|
|
{{.i18n.Tr "auth.active_your_account"}}
|
|
</h2>
|
|
<div class="ui attached segment">
|
|
{{template "base/alert" .}}
|
|
{{if .IsActivatePage}}
|
|
{{if .ServiceNotEnabled}}
|
|
<p class="center">{{.i18n.Tr "auth.disable_register_mail"}}</p>
|
|
{{else if .ResendLimited}}
|
|
<p class="center">{{.i18n.Tr "auth.resent_limit_prompt"}}</p>
|
|
{{else}}
|
|
<p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" (.SignedUser.Email|Escape) .ActiveCodeLives | Str2html}}</p>
|
|
{{end}}
|
|
{{else}}
|
|
{{if .NeedsPassword}}
|
|
<div class="required inline field">
|
|
<label for="password">{{.i18n.Tr "password"}}</label>
|
|
<input id="password" name="password" type="password" autocomplete="off" required>
|
|
</div>
|
|
<div class="inline field">
|
|
<label></label>
|
|
<button class="ui green button">{{.i18n.Tr "install.confirm_password"}}</button>
|
|
</div>
|
|
<input id="code" name="code" type="hidden" value="{{.Code}}">
|
|
{{else if .IsSendRegisterMail}}
|
|
<p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" (.Email|Escape) .ActiveCodeLives | Str2html}}</p>
|
|
{{else if .IsActivateFailed}}
|
|
<p>{{.i18n.Tr "auth.invalid_code"}}</p>
|
|
{{else if .ManualActivationOnly}}
|
|
<p class="center">{{.i18n.Tr "auth.manual_activation_only"}}</p>
|
|
{{else}}
|
|
<p>{{.i18n.Tr "auth.has_unconfirmed_mail" (.SignedUser.Name|Escape) (.SignedUser.Email|Escape) | Str2html}}</p>
|
|
<div class="ui divider"></div>
|
|
<div class="text right">
|
|
<button class="ui blue button">{{.i18n.Tr "auth.resend_mail"}}</button>
|
|
</div>
|
|
{{end}}
|
|
{{end}}
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{template "base/footer" .}}
|