diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index 0b44582e16..11aa820e67 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -91,10 +91,10 @@ func checkContextUser(ctx *context.Context, uid int64) *user_model.User { var orgsAvailable []*organization.Organization for i := range orgs { if ctx.Doer.CanCreateRepoIn(orgs[i].AsUser()) { - orgsAvailable = append(orgsAvailable, orgs[i]) - } + orgsAvailable = append(orgsAvailable, orgs[i]) } - ctx.Data["Orgs"] = orgsAvailable + } + ctx.Data["Orgs"] = orgsAvailable // Not equal means current user is an organization. if uid == ctx.Doer.ID || uid == 0 { @@ -426,7 +426,7 @@ func CreatePost(ctx *context.Context) { func handleActionError(ctx *context.Context, err error) { switch { case errors.Is(err, user_model.ErrBlockedUser): - ctx.Flash.Error(ctx.Tr("repo.action.blocked_user")) + ctx.Flash.Error(ctx.Tr("repo.action.blocked_user")) case repo_service.IsRepositoryLimitReached(err): limit := err.(repo_service.LimitReachedError).Limit ctx.Flash.Error(ctx.TrN(limit, "repo.form.reach_limit_of_creation_1", "repo.form.reach_limit_of_creation_n", limit)) diff --git a/services/repository/generate.go b/services/repository/generate.go index 77eb73f3c9..34b59964f8 100644 --- a/services/repository/generate.go +++ b/services/repository/generate.go @@ -225,9 +225,9 @@ func generateRepoCommit(ctx context.Context, repo, templateRepo, generateRepo *r if giteaTemplateFile != nil { err = processGiteaTemplateFile(ctx, tmpDir, templateRepo, generateRepo, giteaTemplateFile) - if err != nil { - return err - } + if err != nil { + return err + } } if err = git.InitRepository(ctx, tmpDir, false, templateRepo.ObjectFormatName); err != nil { diff --git a/services/repository/template.go b/services/repository/template.go index 88ae4ffb5a..9c462bc528 100644 --- a/services/repository/template.go +++ b/services/repository/template.go @@ -134,53 +134,53 @@ func GenerateRepository(ctx context.Context, doer, owner *user_model.User, templ } // 5 - generate the repository contents according to the template - // Git Content - if opts.GitContent && !templateRepo.IsEmpty { - if err = GenerateGitContent(ctx, templateRepo, generateRepo); err != nil { + // Git Content + if opts.GitContent && !templateRepo.IsEmpty { + if err = GenerateGitContent(ctx, templateRepo, generateRepo); err != nil { return nil, err - } } + } - // Topics - if opts.Topics { - if err = repo_model.GenerateTopics(ctx, templateRepo, generateRepo); err != nil { + // Topics + if opts.Topics { + if err = repo_model.GenerateTopics(ctx, templateRepo, generateRepo); err != nil { return nil, err - } } + } - // Git Hooks - if opts.GitHooks { - if err = GenerateGitHooks(ctx, templateRepo, generateRepo); err != nil { + // Git Hooks + if opts.GitHooks { + if err = GenerateGitHooks(ctx, templateRepo, generateRepo); err != nil { return nil, err - } } + } - // Webhooks - if opts.Webhooks { - if err = GenerateWebhooks(ctx, templateRepo, generateRepo); err != nil { + // Webhooks + if opts.Webhooks { + if err = GenerateWebhooks(ctx, templateRepo, generateRepo); err != nil { return nil, err - } } + } - // Avatar - if opts.Avatar && len(templateRepo.Avatar) > 0 { - if err = generateAvatar(ctx, templateRepo, generateRepo); err != nil { + // Avatar + if opts.Avatar && len(templateRepo.Avatar) > 0 { + if err = generateAvatar(ctx, templateRepo, generateRepo); err != nil { return nil, err - } } + } - // Issue Labels - if opts.IssueLabels { - if err = GenerateIssueLabels(ctx, templateRepo, generateRepo); err != nil { + // Issue Labels + if opts.IssueLabels { + if err = GenerateIssueLabels(ctx, templateRepo, generateRepo); err != nil { return nil, err - } } + } - if opts.ProtectedBranch { - if err = GenerateProtectedBranch(ctx, templateRepo, generateRepo); err != nil { + if opts.ProtectedBranch { + if err = GenerateProtectedBranch(ctx, templateRepo, generateRepo); err != nil { return nil, err - } } + } // 6 - update repository status to be ready generateRepo.Status = repo_model.RepositoryReady diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 7a620b0b56..55f7ca2f32 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -1,233 +1,231 @@ {{template "base/head" .}}