Browse Source

fix autocomplete on migration

for-closed-social
Unknwon 9 years ago
parent
commit
c8bb475abb
6 changed files with 17 additions and 18 deletions
  1. +6
    -6
      modules/bindata/bindata.go
  2. +1
    -1
      public/css/gogs.min.css
  3. +0
    -9
      public/js/gogs.js
  4. +6
    -0
      public/less/_base.less
  5. +2
    -1
      routers/repo/repo.go
  6. +2
    -1
      templates/repo/migrate.tmpl

+ 6
- 6
modules/bindata/bindata.go
File diff suppressed because it is too large
View File


+ 1
- 1
public/css/gogs.min.css
File diff suppressed because it is too large
View File


+ 0
- 9
public/js/gogs.js View File

@ -172,15 +172,6 @@ function initRepository() {
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
if ($('.repository.labels').length > 0) {
// Create label

+ 6
- 0
public/less/_base.less View File

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

+ 2
- 1
routers/repo/repo.go 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.RenderWithErr(ctx.Tr("form.auth_failed", strings.Replace(err.Error(), ":"+form.AuthPassword+"@", ":<password>@", 1)), MIGRATE, &form)
return

+ 2
- 1
templates/repo/migrate.tmpl View File

@ -22,8 +22,9 @@
<div class="content {{if .Err_Auth}}active{{end}}">
<div class="inline field {{if .Err_Auth}}error{{end}}">
<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>
<input class="fake">
<div class="inline field {{if .Err_Auth}}error{{end}}">
<label for="auth_password">{{.i18n.Tr "password"}}</label>
<input id="auth_password" name="auth_password" type="password" value="{{.auth_password}}">

Loading…
Cancel
Save