Skip to content

Commit 1f0625a

Browse files
denyskonGiteaBot
andauthored
Fix projects mode bugs (#29593)
Fix for regressions introduced by #28805 Enabled projects on repos created before the PR weren't detected. Also, the way projects mode was detected in settings didn't match the way it was detected on permission check, which leads to confusion. Co-authored-by: Giteabot <[email protected]>
1 parent da3b7f5 commit 1f0625a

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

models/fixtures/repo_unit.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,6 @@
520520
id: 75
521521
repo_id: 1
522522
type: 8
523-
config: "{\"ProjectsMode\":\"all\"}"
524523
created_unix: 946684810
525524

526525
-

models/repo/repo.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,11 @@ func (repo *Repository) MustGetUnit(ctx context.Context, tp unit.Type) *RepoUnit
412412
Config: new(ActionsConfig),
413413
}
414414
} else if tp == unit.TypeProjects {
415+
cfg := new(ProjectsConfig)
416+
cfg.ProjectsMode = ProjectsModeNone
415417
return &RepoUnit{
416418
Type: tp,
417-
Config: new(ProjectsConfig),
419+
Config: cfg,
418420
}
419421
}
420422

models/repo/repo_unit.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ func (cfg *ProjectsConfig) GetProjectsMode() ProjectsMode {
236236
return cfg.ProjectsMode
237237
}
238238

239-
return ProjectsModeNone
239+
return ProjectsModeAll
240240
}
241241

242242
func (cfg *ProjectsConfig) IsProjectsAllowed(m ProjectsMode) bool {

templates/repo/settings/options.tmpl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -460,19 +460,19 @@
460460
</p>
461461
<div class="ui dropdown selection">
462462
<select name="projects_mode">
463-
<option value="repo" {{if or (not $isProjectsEnabled) (eq $projectsUnit.ProjectsConfig.ProjectsMode "repo")}}selected{{end}}>{{ctx.Locale.Tr "repo.settings.projects_mode_repo"}}</option>
464-
<option value="owner" {{if or (not $isProjectsEnabled) (eq $projectsUnit.ProjectsConfig.ProjectsMode "owner")}}selected{{end}}>{{ctx.Locale.Tr "repo.settings.projects_mode_owner"}}</option>
465-
<option value="all" {{if or (not $isProjectsEnabled) (eq $projectsUnit.ProjectsConfig.ProjectsMode "all")}}selected{{end}}>{{ctx.Locale.Tr "repo.settings.projects_mode_all"}}</option>
463+
<option value="repo" {{if or (not $isProjectsEnabled) (eq $projectsUnit.ProjectsConfig.GetProjectsMode "repo")}}selected{{end}}>{{ctx.Locale.Tr "repo.settings.projects_mode_repo"}}</option>
464+
<option value="owner" {{if or (not $isProjectsEnabled) (eq $projectsUnit.ProjectsConfig.GetProjectsMode "owner")}}selected{{end}}>{{ctx.Locale.Tr "repo.settings.projects_mode_owner"}}</option>
465+
<option value="all" {{if or (not $isProjectsEnabled) (eq $projectsUnit.ProjectsConfig.GetProjectsMode "all")}}selected{{end}}>{{ctx.Locale.Tr "repo.settings.projects_mode_all"}}</option>
466466
</select>
467467
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
468468
<div class="default text">
469-
{{if (eq $projectsUnit.ProjectsConfig.ProjectsMode "repo")}}
469+
{{if (eq $projectsUnit.ProjectsConfig.GetProjectsMode "repo")}}
470470
{{ctx.Locale.Tr "repo.settings.projects_mode_repo"}}
471471
{{end}}
472-
{{if (eq $projectsUnit.ProjectsConfig.ProjectsMode "owner")}}
472+
{{if (eq $projectsUnit.ProjectsConfig.GetProjectsMode "owner")}}
473473
{{ctx.Locale.Tr "repo.settings.projects_mode_owner"}}
474474
{{end}}
475-
{{if (eq $projectsUnit.ProjectsConfig.ProjectsMode "all")}}
475+
{{if (eq $projectsUnit.ProjectsConfig.GetProjectsMode "all")}}
476476
{{ctx.Locale.Tr "repo.settings.projects_mode_all"}}
477477
{{end}}
478478
</div>

0 commit comments

Comments
 (0)