Undo reordering and tmpl redirection

This commit is contained in:
zareck 2023-08-16 14:09:00 -03:00
parent 13738c0380
commit 9ae51c46f4
4 changed files with 13 additions and 138 deletions

View file

@ -281,12 +281,12 @@ const (
PlainGitService // 1 plain git service PlainGitService // 1 plain git service
GithubService // 2 github.com GithubService // 2 github.com
GiteaService // 3 gitea service GiteaService // 3 gitea service
ForgejoService // 4 forgejo service GitlabService // 4 gitlab service
GitlabService // 5 gitlab service GogsService // 5 gogs service
GogsService // 6 gogs service OneDevService // 6 onedev service
OneDevService // 7 onedev service GitBucketService // 7 gitbucket service
GitBucketService // 8 gitbucket service CodebaseService // 8 codebase service
CodebaseService // 9 codebase service ForgejoService // 9 forgejo service
) )
// Name represents the service type's name // Name represents the service type's name
@ -302,8 +302,6 @@ func (gt GitServiceType) Title() string {
return "GitHub" return "GitHub"
case GiteaService: case GiteaService:
return "Gitea" return "Gitea"
case ForgejoService:
return "Forgejo"
case GitlabService: case GitlabService:
return "GitLab" return "GitLab"
case GogsService: case GogsService:
@ -314,6 +312,8 @@ func (gt GitServiceType) Title() string {
return "GitBucket" return "GitBucket"
case CodebaseService: case CodebaseService:
return "Codebase" return "Codebase"
case ForgejoService:
return "Forgejo"
case PlainGitService: case PlainGitService:
return "Git" return "Git"
} }

View file

@ -36,6 +36,8 @@ func ToGitServiceType(value string) structs.GitServiceType {
return structs.OneDevService return structs.OneDevService
case "gitbucket": case "gitbucket":
return structs.GitBucketService return structs.GitBucketService
case "forgejo":
return structs.ForgejoService
default: default:
return structs.PlainGitService return structs.PlainGitService
} }

View file

@ -28,6 +28,8 @@ func TestToGitServiceType(t *testing.T) {
typ: "gitlab", enum: 4, typ: "gitlab", enum: 4,
}, { }, {
typ: "gogs", enum: 5, typ: "gogs", enum: 5,
}, {
typ: "forgejo", enum: 9,
}, { }, {
typ: "trash", enum: 1, typ: "trash", enum: 1,
}} }}

View file

@ -1,130 +1 @@
{{template "base/head" .}} {{template "repo/migrate/gitea" .}}
<div role="main" aria-label="{{.Title}}" class="page-content repository new migrate">
<div class="ui middle very relaxed page grid">
<div class="column">
<form class="ui form" action="{{.Link}}" method="post">
{{.CsrfTokenHtml}}
<h3 class="ui top attached header">
{{.locale.Tr "repo.migrate.migrate" .service.Title}}
<input id="service_type" type="hidden" name="service" value="{{.service}}">
</h3>
<div class="ui attached segment">
{{template "base/alert" .}}
<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
<label for="clone_addr">{{.locale.Tr "repo.migrate.clone_address"}}</label>
<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required>
<span class="help">
{{.locale.Tr "repo.migrate.clone_address_desc"}}{{if .ContextUser.CanImportLocal}} {{.locale.Tr "repo.migrate.clone_local_path"}}{{end}}
</span>
</div>
<div class="inline field {{if .Err_Auth}}error{{end}}">
<label for="auth_token">{{.locale.Tr "access_token"}}</label>
<input id="auth_token" name="auth_token" type="password" autocomplete="new-password" value="{{.auth_token}}" {{if not .auth_token}} data-need-clear="true" {{end}}>
<!-- <a target="_blank" href="https://docs.gitea.io/en-us/api-usage">{{svg "octicon-question"}}</a> -->
</div>
{{template "repo/migrate/options" .}}
<div class="inline field">
<label>{{.locale.Tr "repo.migrate_items"}}</label>
<div class="ui checkbox">
<input name="wiki" type="checkbox" {{if .wiki}} checked{{end}}>
<label>{{.locale.Tr "repo.migrate_items_wiki" | Safe}}</label>
</div>
</div>
<div id="migrate_items">
<span class="help">{{.locale.Tr "repo.migrate.migrate_items_options"}}</span>
<div class="inline field">
<label></label>
<div class="ui checkbox">
<input name="labels" type="checkbox" {{if .labels}} checked{{end}}>
<label>{{.locale.Tr "repo.migrate_items_labels" | Safe}}</label>
</div>
<div class="ui checkbox">
<input name="issues" type="checkbox" {{if .issues}} checked{{end}}>
<label>{{.locale.Tr "repo.migrate_items_issues" | Safe}}</label>
</div>
</div>
<div class="inline field">
<label></label>
<div class="ui checkbox">
<input name="milestones" type="checkbox" {{if .milestones}} checked{{end}}>
<label>{{.locale.Tr "repo.migrate_items_milestones" | Safe}}</label>
</div>
</div>
<!-- Gogs do not support it
<div class="inline field">
<label></label>
<div class="ui checkbox">
<input name="pull_requests" type="checkbox" {{if .pull_requests}} checked{{end}}>
<label>{{.locale.Tr "repo.migrate_items_merge_requests" | Safe}}</label>
</div>
<div class="ui checkbox">
<input name="releases" type="checkbox" {{if .releases}} checked{{end}}>
<label>{{.locale.Tr "repo.migrate_items_releases" | Safe}}</label>
</div>
</div>
-->
</div>
<div class="divider"></div>
<div class="inline required field {{if .Err_Owner}}error{{end}}">
<label>{{.locale.Tr "repo.owner"}}</label>
<div class="ui selection owner dropdown">
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
<span class="text truncated-item-container" title="{{.ContextUser.Name}}">
{{ctx.AvatarUtils.Avatar .ContextUser}}
<span class="truncated-item-name">{{.ContextUser.ShortName 40}}</span>
</span>
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
<div class="menu" title="{{.SignedUser.Name}}">
<div class="item truncated-item-container" data-value="{{.SignedUser.ID}}">
{{ctx.AvatarUtils.Avatar .SignedUser}}
<span class="truncated-item-name">{{.SignedUser.ShortName 40}}</span>
</div>
{{range .Orgs}}
<div class="item truncated-item-container" data-value="{{.ID}}" title="{{.Name}}">
{{ctx.AvatarUtils.Avatar .}}
<span class="truncated-item-name">{{.ShortName 40}}</span>
</div>
{{end}}
</div>
</div>
</div>
<div class="inline required field {{if .Err_RepoName}}error{{end}}">
<label for="repo_name">{{.locale.Tr "repo.repo_name"}}</label>
<input id="repo_name" name="repo_name" value="{{.repo_name}}" required maxlength="100">
</div>
<div class="inline field">
<label>{{.locale.Tr "repo.visibility"}}</label>
<div class="ui checkbox">
{{if .IsForcedPrivate}}
<input name="private" type="checkbox" checked readonly>
<label>{{.locale.Tr "repo.visibility_helper_forced" | Safe}}</label>
{{else}}
<input name="private" type="checkbox" {{if .private}} checked{{end}}>
<label>{{.locale.Tr "repo.visibility_helper" | Safe}}</label>
{{end}}
</div>
</div>
<div class="inline field {{if .Err_Description}}error{{end}}">
<label for="description">{{.locale.Tr "repo.repo_desc"}}</label>
<textarea id="description" name="description" maxlength="2048">{{.description}}</textarea>
</div>
<div class="inline field">
<label></label>
<button class="ui green button">
{{.locale.Tr "repo.migrate_repo"}}
</button>
</div>
</div>
</form>
</div>
</div>
</div>
{{template "base/footer" .}}