Browse Source

#2037 Add "New Mirror" button on Dashboard

Unknwon 9 years ago
parent
commit
b8d48bdb62

+ 1 - 0
conf/locale/locale_en-US.ini

@@ -28,6 +28,7 @@ organization = Organization
 mirror = Mirror
 new_repo = New Repository
 new_migrate = New Migration
+new_mirror = New Mirror
 new_fork = New Fork Repository
 new_org = New Organization
 manage_org = Manage Organizations

+ 0 - 3
modules/auth/repo_form.go

@@ -69,9 +69,6 @@ func (f MigrateRepoForm) ParseRemoteAddr(user *models.User) (string, error) {
 		}
 		if len(f.AuthUsername)+len(f.AuthPassword) > 0 {
 			u.User = url.UserPassword(f.AuthUsername, f.AuthPassword)
-		} else {
-			// Fake user name and password to prevent prompt and fail quick.
-			u.User = url.UserPassword("fake_user", "")
 		}
 		remoteAddr = u.String()
 	} else if !user.CanImportLocal() {

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


+ 1 - 0
routers/repo/repo.go

@@ -139,6 +139,7 @@ func Migrate(ctx *middleware.Context) {
 	ctx.Data["Title"] = ctx.Tr("new_migrate")
 	ctx.Data["private"] = ctx.User.LastRepoVisibility
 	ctx.Data["IsForcedPrivate"] = setting.Repository.ForcePrivate
+	ctx.Data["mirror"] = ctx.Query("mirror") == "1"
 
 	ctxUser := checkContextUser(ctx, ctx.QueryInt64("org"))
 	if ctx.Written() {

+ 1 - 1
templates/user/dashboard/dashboard.tmpl

@@ -89,7 +89,7 @@
 					<h4 class="ui top attached header">
 						{{.i18n.Tr "home.my_mirrors"}} <span class="ui grey label">{{.MirrorCount}}</span>
 						<div class="ui right">
-							<a class="ui blue tiny show-panel button" href="{{AppSubUrl}}/repo/migrate">{{.i18n.Tr "new_migrate"}}</a>
+							<a class="ui blue tiny show-panel button" href="{{AppSubUrl}}/repo/migrate?mirror=1">{{.i18n.Tr "new_mirror"}}</a>
 						</div>
 					</h4>
 					<div class="ui attached table segment">

Some files were not shown because too many files changed in this diff