mirror of
https://github.com/go-gitea/gitea
synced 2024-09-10 16:37:55 +02:00
Support copy protected branch from template repository (#25889)
Fix #14303
This commit is contained in:
parent
2b6f224336
commit
037c9895a7
@ -313,11 +313,13 @@ type GenerateRepoOptions struct {
|
||||
Webhooks bool
|
||||
Avatar bool
|
||||
IssueLabels bool
|
||||
ProtectedBranch bool
|
||||
}
|
||||
|
||||
// IsValid checks whether at least one option is chosen for generation
|
||||
func (gro GenerateRepoOptions) IsValid() bool {
|
||||
return gro.GitContent || gro.Topics || gro.GitHooks || gro.Webhooks || gro.Avatar || gro.IssueLabels // or other items as they are added
|
||||
return gro.GitContent || gro.Topics || gro.GitHooks || gro.Webhooks || gro.Avatar ||
|
||||
gro.IssueLabels || gro.ProtectedBranch // or other items as they are added
|
||||
}
|
||||
|
||||
// GenerateRepository generates a repository from a template
|
||||
|
@ -238,6 +238,8 @@ type GenerateRepoOption struct {
|
||||
Avatar bool `json:"avatar"`
|
||||
// include labels in template repo
|
||||
Labels bool `json:"labels"`
|
||||
// include protected branches in template repo
|
||||
ProtectedBranch bool `json:"protected_branch"`
|
||||
}
|
||||
|
||||
// CreateBranchRepoOption options when creating a branch in a repository
|
||||
|
@ -365,6 +365,7 @@ func Generate(ctx *context.APIContext) {
|
||||
Webhooks: form.Webhooks,
|
||||
Avatar: form.Avatar,
|
||||
IssueLabels: form.Labels,
|
||||
ProtectedBranch: form.ProtectedBranch,
|
||||
}
|
||||
|
||||
if !opts.IsValid() {
|
||||
|
@ -250,6 +250,7 @@ func CreatePost(ctx *context.Context) {
|
||||
Webhooks: form.Webhooks,
|
||||
Avatar: form.Avatar,
|
||||
IssueLabels: form.Labels,
|
||||
ProtectedBranch: form.ProtectedBranch,
|
||||
}
|
||||
|
||||
if !opts.IsValid() {
|
||||
|
@ -49,6 +49,7 @@ type CreateRepoForm struct {
|
||||
Webhooks bool
|
||||
Avatar bool
|
||||
Labels bool
|
||||
ProtectedBranch bool
|
||||
TrustModel string
|
||||
}
|
||||
|
||||
|
@ -7,6 +7,7 @@ import (
|
||||
"context"
|
||||
|
||||
"code.gitea.io/gitea/models/db"
|
||||
git_model "code.gitea.io/gitea/models/git"
|
||||
issues_model "code.gitea.io/gitea/models/issues"
|
||||
repo_model "code.gitea.io/gitea/models/repo"
|
||||
user_model "code.gitea.io/gitea/models/user"
|
||||
@ -39,6 +40,28 @@ func GenerateIssueLabels(ctx context.Context, templateRepo, generateRepo *repo_m
|
||||
return db.Insert(ctx, newLabels)
|
||||
}
|
||||
|
||||
func GenerateProtectedBranch(ctx context.Context, templateRepo, generateRepo *repo_model.Repository) error {
|
||||
templateBranches, err := git_model.FindRepoProtectedBranchRules(ctx, templateRepo.ID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// Prevent insert being called with an empty slice which would result in
|
||||
// err "no element on slice when insert".
|
||||
if len(templateBranches) == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
newBranches := make([]*git_model.ProtectedBranch, 0, len(templateBranches))
|
||||
for _, templateBranch := range templateBranches {
|
||||
templateBranch.ID = 0
|
||||
templateBranch.RepoID = generateRepo.ID
|
||||
templateBranch.UpdatedUnix = 0
|
||||
templateBranch.CreatedUnix = 0
|
||||
newBranches = append(newBranches, templateBranch)
|
||||
}
|
||||
return db.Insert(ctx, newBranches)
|
||||
}
|
||||
|
||||
// GenerateRepository generates a repository from a template
|
||||
func GenerateRepository(ctx context.Context, doer, owner *user_model.User, templateRepo *repo_model.Repository, opts repo_module.GenerateRepoOptions) (_ *repo_model.Repository, err error) {
|
||||
if !doer.IsAdmin && !owner.CanCreateRepo() {
|
||||
@ -96,6 +119,12 @@ func GenerateRepository(ctx context.Context, doer, owner *user_model.User, templ
|
||||
}
|
||||
}
|
||||
|
||||
if opts.ProtectedBranch {
|
||||
if err = GenerateProtectedBranch(ctx, templateRepo, generateRepo); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}); err != nil {
|
||||
return nil, err
|
||||
|
@ -107,6 +107,13 @@
|
||||
<label>{{.locale.Tr "repo.template.issue_labels"}}</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="inline field">
|
||||
<label></label>
|
||||
<div class="ui checkbox">
|
||||
<input name="protected_branch" type="checkbox" tabindex="0" {{if .protected_branch}}checked{{end}}>
|
||||
<label>{{.locale.Tr "repo.settings.protected_branch"}}</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="non_template">
|
||||
|
5
templates/swagger/v1_json.tmpl
generated
5
templates/swagger/v1_json.tmpl
generated
@ -18906,6 +18906,11 @@
|
||||
"type": "boolean",
|
||||
"x-go-name": "Private"
|
||||
},
|
||||
"protected_branch": {
|
||||
"description": "include protected branches in template repo",
|
||||
"type": "boolean",
|
||||
"x-go-name": "ProtectedBranch"
|
||||
},
|
||||
"topics": {
|
||||
"description": "include topics in template repo",
|
||||
"type": "boolean",
|
||||
|
Loading…
Reference in New Issue
Block a user