fix autocomplete on migration

This commit is contained in:
Unknwon 2015-08-15 18:16:39 +08:00
parent ce8864c69a
commit c8bb475abb
6 changed files with 17 additions and 18 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -172,15 +172,6 @@ function initRepository() {
return; return;
} }
// New migrate
if ($('.repository.new.migrate').length > 0) {
// Clear browser autocomplete.
if ($('#auth_username').data('need-clear')) {
$('#auth_username').val('');
$('#auth_password').val('');
}
}
// Labels // Labels
if ($('.repository.labels').length > 0) { if ($('.repository.labels').length > 0) {
// Create label // Create label

View file

@ -106,6 +106,12 @@ img {
.avatar.image { .avatar.image {
border-radius: 3px; border-radius: 3px;
} }
.form {
.fake {
display: none!important;
}
}
} }
footer { footer {

View file

@ -214,7 +214,8 @@ func MigratePost(ctx *middleware.Context, form auth.MigrateRepoForm) {
} }
} }
if strings.Contains(err.Error(), "Authentication failed") { if strings.Contains(err.Error(), "Authentication failed") ||
strings.Contains(err.Error(), " not found") {
ctx.Data["Err_Auth"] = true ctx.Data["Err_Auth"] = true
ctx.RenderWithErr(ctx.Tr("form.auth_failed", strings.Replace(err.Error(), ":"+form.AuthPassword+"@", ":<password>@", 1)), MIGRATE, &form) ctx.RenderWithErr(ctx.Tr("form.auth_failed", strings.Replace(err.Error(), ":"+form.AuthPassword+"@", ":<password>@", 1)), MIGRATE, &form)
return return

View file

@ -22,8 +22,9 @@
<div class="content {{if .Err_Auth}}active{{end}}"> <div class="content {{if .Err_Auth}}active{{end}}">
<div class="inline field {{if .Err_Auth}}error{{end}}"> <div class="inline field {{if .Err_Auth}}error{{end}}">
<label for="auth_username">{{.i18n.Tr "username"}}</label> <label for="auth_username">{{.i18n.Tr "username"}}</label>
<input id="auth_username" name="auth_username" value="{{.auth_username}}123" {{if not .auth_username}}data-need-clear="true"{{end}}> <input id="auth_username" name="auth_username" value="{{.auth_username}}" {{if not .auth_username}}data-need-clear="true"{{end}}>
</div> </div>
<input class="fake">
<div class="inline field {{if .Err_Auth}}error{{end}}"> <div class="inline field {{if .Err_Auth}}error{{end}}">
<label for="auth_password">{{.i18n.Tr "password"}}</label> <label for="auth_password">{{.i18n.Tr "password"}}</label>
<input id="auth_password" name="auth_password" type="password" value="{{.auth_password}}"> <input id="auth_password" name="auth_password" type="password" value="{{.auth_password}}">