* added button * got URL params to carry through to service specific migrate pages * do not display add mirror button if mirroring turned off * added corrections by reviewers * Add silverwind's suggestion Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: silverwind <me@silverwind.io>
This commit is contained in:
		
							parent
							
								
									d2ad4dec63
								
							
						
					
					
						commit
						9b11c3e320
					
				
					 4 changed files with 10 additions and 2 deletions
				
			
		|  | @ -127,6 +127,8 @@ func Home(ctx *context.Context) { | |||
| 	ctx.Data["Members"] = members | ||||
| 	ctx.Data["Teams"] = org.Teams | ||||
| 
 | ||||
| 	ctx.Data["DisabledMirrors"] = setting.Repository.DisableMirrors | ||||
| 
 | ||||
| 	pager := context.NewPagination(int(count), setting.UI.User.RepoPagingNum, page, 5) | ||||
| 	pager.SetDefaultParams(ctx) | ||||
| 	ctx.Data["Page"] = pager | ||||
|  |  | |||
|  | @ -28,6 +28,9 @@ func Migrate(ctx *context.Context) { | |||
| 	ctx.Data["Services"] = append([]structs.GitServiceType{structs.PlainGitService}, structs.SupportedFullGitService...) | ||||
| 	serviceType := ctx.QueryInt("service_type") | ||||
| 	if serviceType == 0 { | ||||
| 		ctx.Data["Org"] = ctx.Query("org") | ||||
| 		ctx.Data["Mirror"] = ctx.Query("mirror") | ||||
| 
 | ||||
| 		ctx.HTML(200, tplMigrate) | ||||
| 		return | ||||
| 	} | ||||
|  |  | |||
|  | @ -28,6 +28,9 @@ | |||
| 			<div class="ui eleven wide column"> | ||||
| 				{{if .CanCreateOrgRepo}} | ||||
| 					<div class="text right"> | ||||
|             {{if not .DisabledMirrors}} | ||||
| 						  <a class="ui green button" href="{{AppSubUrl}}/repo/migrate?org={{.Org.ID}}&mirror=1">{{.i18n.Tr "new_migrate"}}</a> | ||||
|             {{end}} | ||||
| 						<a class="ui green button" href="{{AppSubUrl}}/repo/create?org={{.Org.ID}}">{{.i18n.Tr "new_repo"}}</a> | ||||
| 					</div> | ||||
| 					<div class="ui divider"></div> | ||||
|  |  | |||
|  | @ -5,11 +5,11 @@ | |||
| 			<div class="ui three stackable cards"> | ||||
| 				{{range .Services}} | ||||
| 					<div class="ui card"> | ||||
| 						<a class="image" href="{{AppSubUrl}}/repo/migrate?service_type={{.}}"> | ||||
| 						<a class="image" href="{{AppSubUrl}}/repo/migrate?service_type={{.}}&org={{$.Org}}&mirror={{$.Mirror}}"> | ||||
| 							{{svg (Printf "gitea-%s" .Name) 184}} | ||||
| 						</a> | ||||
| 						<div class="content"> | ||||
| 							<a class="header" href="{{AppSubUrl}}/repo/migrate?service_type={{.}}">{{.Title}}</a> | ||||
| 							<a class="header" href="{{AppSubUrl}}/repo/migrate?service_type={{.}}&org={{$.Org}}&mirror={{$.Mirror}}">{{.Title}}</a> | ||||
| 							<div class="description"> | ||||
| 								{{(Printf "repo.migrate.%s.description" .Name) | $.i18n.Tr }} | ||||
| 							</div> | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue