From 8a6925fbbae301f50b5dd00c2d8557d0cb2a5d73 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Thu, 4 May 2023 18:44:45 +0800 Subject: [PATCH 01/11] fix --- routers/web/org/teams.go | 6 ++++++ templates/org/team/new.tmpl | 12 ++++++++---- templates/org/team/sidebar.tmpl | 28 +++++++++++++++++----------- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go index 9a0f49b688ed1..8be32a3853455 100644 --- a/routers/web/org/teams.go +++ b/routers/web/org/teams.go @@ -271,6 +271,8 @@ func NewTeam(ctx *context.Context) { ctx.Data["PageIsOrgTeamsNew"] = true ctx.Data["Team"] = &org_model.Team{} ctx.Data["Units"] = unit_model.Units + ctx.Data["IsActionsDisabled"] = !setting.Actions.Enabled + ctx.HTML(http.StatusOK, tplTeamNew) } @@ -379,6 +381,7 @@ func TeamMembers(ctx *context.Context) { } ctx.Data["Invites"] = invites ctx.Data["IsEmailInviteEnabled"] = setting.MailService != nil + ctx.Data["IsActionsEnabled"] = setting.Actions.Enabled ctx.HTML(http.StatusOK, tplTeamMembers) } @@ -393,6 +396,8 @@ func TeamRepositories(ctx *context.Context) { return } ctx.Data["Units"] = unit_model.Units + ctx.Data["IsActionsEnabled"] = setting.Actions.Enabled + ctx.HTML(http.StatusOK, tplTeamRepositories) } @@ -448,6 +453,7 @@ func EditTeam(ctx *context.Context) { } ctx.Data["Team"] = ctx.Org.Team ctx.Data["Units"] = unit_model.Units + ctx.Data["IsActionsDisabled"] = !setting.Actions.Enabled ctx.HTML(http.StatusOK, tplTeamNew) } diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 0cba09be51390..9b17d2452ff8d 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -88,28 +88,32 @@ {{range $t, $unit := $.Units}} {{if ge $unit.MaxPerm 2}} + {{$isActionsUnit := false}} + {{if eq $unit.Type 10}} + {{$isActionsUnit = true}} + {{end}}
- + {{$.locale.Tr $unit.DescKey}}
- +
- +
- +
diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl index f215dd52cd056..2f7a34e684985 100644 --- a/templates/org/team/sidebar.tmpl +++ b/templates/org/team/sidebar.tmpl @@ -58,17 +58,23 @@ {{range $t, $unit := $.Units}} - {{if (not $unit.Type.UnitGlobalDisabled)}} - - {{$.locale.Tr $unit.NameKey}} - {{if eq ($.Team.UnitAccessMode $.Context $unit.Type) 0 -}} - {{$.locale.Tr "org.teams.none_access"}} - {{- else if or (eq $.Team.ID 0) (eq ($.Team.UnitAccessMode $.Context $unit.Type) 1) -}} - {{$.locale.Tr "org.teams.read_access"}} - {{- else if eq ($.Team.UnitAccessMode $.Context $unit.Type) 2 -}} - {{$.locale.Tr "org.teams.write_access"}} - {{- end}} - + {{if not $unit.Type.UnitGlobalDisabled}} + {{$isActionsUnit := false}} + {{if eq $unit.Type 10}} + {{$isActionsUnit = true}} + {{end}} + {{if or (not $isActionsUnit) (and $isActionsUnit $.IsActionsEnabled)}} + + {{$.locale.Tr $unit.NameKey}} + {{if eq ($.Team.UnitAccessMode $.Context $unit.Type) 0 -}} + {{$.locale.Tr "org.teams.none_access"}} + {{- else if or (eq $.Team.ID 0) (eq ($.Team.UnitAccessMode $.Context $unit.Type) 1) -}} + {{$.locale.Tr "org.teams.read_access"}} + {{- else if eq ($.Team.UnitAccessMode $.Context $unit.Type) 2 -}} + {{$.locale.Tr "org.teams.write_access"}} + {{- end}} + + {{end}} {{end}} {{end}} From e19b232e7755be609a5a55c25a2e9c284f12c31b Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Thu, 4 May 2023 18:47:58 +0800 Subject: [PATCH 02/11] fix --- routers/web/org/teams.go | 4 ++-- templates/org/team/sidebar.tmpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go index 8be32a3853455..b8086ef3e99cb 100644 --- a/routers/web/org/teams.go +++ b/routers/web/org/teams.go @@ -381,7 +381,7 @@ func TeamMembers(ctx *context.Context) { } ctx.Data["Invites"] = invites ctx.Data["IsEmailInviteEnabled"] = setting.MailService != nil - ctx.Data["IsActionsEnabled"] = setting.Actions.Enabled + ctx.Data["IsActionsDisabled"] = !setting.Actions.Enabled ctx.HTML(http.StatusOK, tplTeamMembers) } @@ -396,7 +396,7 @@ func TeamRepositories(ctx *context.Context) { return } ctx.Data["Units"] = unit_model.Units - ctx.Data["IsActionsEnabled"] = setting.Actions.Enabled + ctx.Data["IsActionsDisabled"] = !setting.Actions.Enabled ctx.HTML(http.StatusOK, tplTeamRepositories) } diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl index 2f7a34e684985..f76448db5e788 100644 --- a/templates/org/team/sidebar.tmpl +++ b/templates/org/team/sidebar.tmpl @@ -63,7 +63,7 @@ {{if eq $unit.Type 10}} {{$isActionsUnit = true}} {{end}} - {{if or (not $isActionsUnit) (and $isActionsUnit $.IsActionsEnabled)}} + {{if not (and $.IsActionsDisabled $isActionsUnit)}} {{$.locale.Tr $unit.NameKey}} {{if eq ($.Team.UnitAccessMode $.Context $unit.Type) 0 -}} From 136606995f6e951dce6eaa3e2cc212386bb5c7a1 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Fri, 5 May 2023 11:29:43 +0800 Subject: [PATCH 03/11] tooltip --- templates/org/team/new.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 9b17d2452ff8d..cadb1de99744a 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -94,7 +94,7 @@ {{end}} -
+
{{$.locale.Tr $unit.DescKey}} From 433693b0bebbf30734e3a8896fcbee8f59d5d864 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Fri, 5 May 2023 12:55:08 +0800 Subject: [PATCH 04/11] check actions when init config --- models/unit/unit.go | 12 ++++++++++++ routers/web/org/teams.go | 4 ---- templates/org/team/new.tmpl | 14 +++++--------- templates/org/team/sidebar.tmpl | 26 ++++++++++---------------- 4 files changed, 27 insertions(+), 29 deletions(-) diff --git a/models/unit/unit.go b/models/unit/unit.go index 3d5a8842cd638..7a92e7ddf6cb5 100644 --- a/models/unit/unit.go +++ b/models/unit/unit.go @@ -156,14 +156,26 @@ func LoadUnitConfig() { if len(invalidKeys) > 0 { log.Warn("Invalid keys in disabled repo units: %s", strings.Join(invalidKeys, ", ")) } + + var isActionsDisabled bool // Check that must units are not disabled for i, disabledU := range DisabledRepoUnits { + if disabledU == TypeActions { + isActionsDisabled = true + } if !disabledU.CanDisable() { log.Warn("Not allowed to global disable unit %s", disabledU.String()) DisabledRepoUnits = append(DisabledRepoUnits[:i], DisabledRepoUnits[i+1:]...) } } + // Check that actions.ENABLED + if !isActionsDisabled && !setting.Actions.Enabled { + // not disabled in `repo.DISABLED_REPO_UNITS`` but disabled in `actions.ENABLED` + // also append into the slice of DisabledRepoUnits + DisabledRepoUnits = append(DisabledRepoUnits, TypeActions) + } + setDefaultRepoUnits, invalidKeys := FindUnitTypes(setting.Repository.DefaultRepoUnits...) if len(invalidKeys) > 0 { log.Warn("Invalid keys in default repo units: %s", strings.Join(invalidKeys, ", ")) diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go index b8086ef3e99cb..edd6f3fffd914 100644 --- a/routers/web/org/teams.go +++ b/routers/web/org/teams.go @@ -271,7 +271,6 @@ func NewTeam(ctx *context.Context) { ctx.Data["PageIsOrgTeamsNew"] = true ctx.Data["Team"] = &org_model.Team{} ctx.Data["Units"] = unit_model.Units - ctx.Data["IsActionsDisabled"] = !setting.Actions.Enabled ctx.HTML(http.StatusOK, tplTeamNew) } @@ -381,7 +380,6 @@ func TeamMembers(ctx *context.Context) { } ctx.Data["Invites"] = invites ctx.Data["IsEmailInviteEnabled"] = setting.MailService != nil - ctx.Data["IsActionsDisabled"] = !setting.Actions.Enabled ctx.HTML(http.StatusOK, tplTeamMembers) } @@ -396,7 +394,6 @@ func TeamRepositories(ctx *context.Context) { return } ctx.Data["Units"] = unit_model.Units - ctx.Data["IsActionsDisabled"] = !setting.Actions.Enabled ctx.HTML(http.StatusOK, tplTeamRepositories) } @@ -453,7 +450,6 @@ func EditTeam(ctx *context.Context) { } ctx.Data["Team"] = ctx.Org.Team ctx.Data["Units"] = unit_model.Units - ctx.Data["IsActionsDisabled"] = !setting.Actions.Enabled ctx.HTML(http.StatusOK, tplTeamNew) } diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index cadb1de99744a..8957e4d6cfa4d 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -88,32 +88,28 @@ {{range $t, $unit := $.Units}} {{if ge $unit.MaxPerm 2}} - {{$isActionsUnit := false}} - {{if eq $unit.Type 10}} - {{$isActionsUnit = true}} - {{end}} -
+
- + {{$.locale.Tr $unit.DescKey}}
- +
- +
- +
diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl index f76448db5e788..5bb9d6b674da6 100644 --- a/templates/org/team/sidebar.tmpl +++ b/templates/org/team/sidebar.tmpl @@ -59,22 +59,16 @@ {{range $t, $unit := $.Units}} {{if not $unit.Type.UnitGlobalDisabled}} - {{$isActionsUnit := false}} - {{if eq $unit.Type 10}} - {{$isActionsUnit = true}} - {{end}} - {{if not (and $.IsActionsDisabled $isActionsUnit)}} - - {{$.locale.Tr $unit.NameKey}} - {{if eq ($.Team.UnitAccessMode $.Context $unit.Type) 0 -}} - {{$.locale.Tr "org.teams.none_access"}} - {{- else if or (eq $.Team.ID 0) (eq ($.Team.UnitAccessMode $.Context $unit.Type) 1) -}} - {{$.locale.Tr "org.teams.read_access"}} - {{- else if eq ($.Team.UnitAccessMode $.Context $unit.Type) 2 -}} - {{$.locale.Tr "org.teams.write_access"}} - {{- end}} - - {{end}} + + {{$.locale.Tr $unit.NameKey}} + {{if eq ($.Team.UnitAccessMode $.Context $unit.Type) 0 -}} + {{$.locale.Tr "org.teams.none_access"}} + {{- else if or (eq $.Team.ID 0) (eq ($.Team.UnitAccessMode $.Context $unit.Type) 1) -}} + {{$.locale.Tr "org.teams.read_access"}} + {{- else if eq ($.Team.UnitAccessMode $.Context $unit.Type) 2 -}} + {{$.locale.Tr "org.teams.write_access"}} + {{- end}} + {{end}} {{end}} From a310cda7689cd6cbf0de52c97d2ef44dc85c417c Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Fri, 5 May 2023 12:57:28 +0800 Subject: [PATCH 05/11] revert --- routers/web/org/teams.go | 2 -- templates/org/team/new.tmpl | 2 +- templates/org/team/sidebar.tmpl | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go index edd6f3fffd914..9a0f49b688ed1 100644 --- a/routers/web/org/teams.go +++ b/routers/web/org/teams.go @@ -271,7 +271,6 @@ func NewTeam(ctx *context.Context) { ctx.Data["PageIsOrgTeamsNew"] = true ctx.Data["Team"] = &org_model.Team{} ctx.Data["Units"] = unit_model.Units - ctx.HTML(http.StatusOK, tplTeamNew) } @@ -394,7 +393,6 @@ func TeamRepositories(ctx *context.Context) { return } ctx.Data["Units"] = unit_model.Units - ctx.HTML(http.StatusOK, tplTeamRepositories) } diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 8957e4d6cfa4d..0cba09be51390 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -99,7 +99,7 @@
- +
diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl index 5bb9d6b674da6..ffdffeaccab4d 100644 --- a/templates/org/team/sidebar.tmpl +++ b/templates/org/team/sidebar.tmpl @@ -58,7 +58,7 @@ {{range $t, $unit := $.Units}} - {{if not $unit.Type.UnitGlobalDisabled}} + {{if not ($unit.Type.UnitGlobalDisabled)}} {{$.locale.Tr $unit.NameKey}} {{if eq ($.Team.UnitAccessMode $.Context $unit.Type) 0 -}} From 0757bfeb178f7d369577c104cea35f908a193787 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Fri, 5 May 2023 12:57:59 +0800 Subject: [PATCH 06/11] fix --- templates/org/team/sidebar.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl index ffdffeaccab4d..f215dd52cd056 100644 --- a/templates/org/team/sidebar.tmpl +++ b/templates/org/team/sidebar.tmpl @@ -58,7 +58,7 @@ {{range $t, $unit := $.Units}} - {{if not ($unit.Type.UnitGlobalDisabled)}} + {{if (not $unit.Type.UnitGlobalDisabled)}} {{$.locale.Tr $unit.NameKey}} {{if eq ($.Team.UnitAccessMode $.Context $unit.Type) 0 -}} From 03ef03d0e9ae3f0415843182b6b9abd42929f7db Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Fri, 5 May 2023 12:58:57 +0800 Subject: [PATCH 07/11] typo --- models/unit/unit.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/unit/unit.go b/models/unit/unit.go index 7a92e7ddf6cb5..34711ed5c650d 100644 --- a/models/unit/unit.go +++ b/models/unit/unit.go @@ -171,7 +171,7 @@ func LoadUnitConfig() { // Check that actions.ENABLED if !isActionsDisabled && !setting.Actions.Enabled { - // not disabled in `repo.DISABLED_REPO_UNITS`` but disabled in `actions.ENABLED` + // not disabled in `repo.DISABLED_REPO_UNITS` but disabled in `actions.ENABLED` // also append into the slice of DisabledRepoUnits DisabledRepoUnits = append(DisabledRepoUnits, TypeActions) } From 6f748c944ba57217a3b38908c05f45c500d8eebc Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Fri, 5 May 2023 13:44:15 +0800 Subject: [PATCH 08/11] unit test --- models/unit/unit_test.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/models/unit/unit_test.go b/models/unit/unit_test.go index 50d781719771d..0d3f97a6959de 100644 --- a/models/unit/unit_test.go +++ b/models/unit/unit_test.go @@ -27,6 +27,7 @@ func TestLoadUnitConfig(t *testing.T) { setting.Repository.DisabledRepoUnits = []string{"repo.issues"} setting.Repository.DefaultRepoUnits = []string{"repo.code", "repo.releases", "repo.issues", "repo.pulls"} setting.Repository.DefaultForkRepoUnits = []string{"repo.releases"} + setting.Actions.Enabled = true LoadUnitConfig() assert.Equal(t, []Type{TypeIssues}, DisabledRepoUnits) assert.Equal(t, []Type{TypeCode, TypeReleases, TypePullRequests}, DefaultRepoUnits) @@ -36,6 +37,7 @@ func TestLoadUnitConfig(t *testing.T) { setting.Repository.DisabledRepoUnits = []string{"repo.issues", "invalid.1"} setting.Repository.DefaultRepoUnits = []string{"repo.code", "invalid.2", "repo.releases", "repo.issues", "repo.pulls"} setting.Repository.DefaultForkRepoUnits = []string{"invalid.3", "repo.releases"} + setting.Actions.Enabled = true LoadUnitConfig() assert.Equal(t, []Type{TypeIssues}, DisabledRepoUnits) assert.Equal(t, []Type{TypeCode, TypeReleases, TypePullRequests}, DefaultRepoUnits) @@ -45,9 +47,20 @@ func TestLoadUnitConfig(t *testing.T) { setting.Repository.DisabledRepoUnits = []string{"repo.issues", "repo.issues"} setting.Repository.DefaultRepoUnits = []string{"repo.code", "repo.releases", "repo.issues", "repo.pulls", "repo.code"} setting.Repository.DefaultForkRepoUnits = []string{"repo.releases", "repo.releases"} + setting.Actions.Enabled = true LoadUnitConfig() assert.Equal(t, []Type{TypeIssues}, DisabledRepoUnits) assert.Equal(t, []Type{TypeCode, TypeReleases, TypePullRequests}, DefaultRepoUnits) assert.Equal(t, []Type{TypeCode, TypeReleases}, DefaultForkRepoUnits) }) + t.Run("actions_disbaled", func(t *testing.T) { + setting.Repository.DisabledRepoUnits = []string{"repo.issues"} + setting.Repository.DefaultRepoUnits = []string{"repo.code", "repo.releases", "repo.issues", "repo.pulls"} + setting.Repository.DefaultForkRepoUnits = []string{"repo.releases"} + setting.Actions.Enabled = false + LoadUnitConfig() + assert.Equal(t, []Type{TypeIssues, TypeActions}, DisabledRepoUnits) + assert.Equal(t, []Type{TypeCode, TypeReleases, TypePullRequests}, DefaultRepoUnits) + assert.Equal(t, []Type{TypeCode, TypeReleases}, DefaultForkRepoUnits) + }) } From 1f79db891ab0481c08d69ae53cd3ec8e94a626f9 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Fri, 5 May 2023 13:50:45 +0800 Subject: [PATCH 09/11] typo --- models/unit/unit_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/unit/unit_test.go b/models/unit/unit_test.go index 0d3f97a6959de..88fd54ad2cd6d 100644 --- a/models/unit/unit_test.go +++ b/models/unit/unit_test.go @@ -53,7 +53,7 @@ func TestLoadUnitConfig(t *testing.T) { assert.Equal(t, []Type{TypeCode, TypeReleases, TypePullRequests}, DefaultRepoUnits) assert.Equal(t, []Type{TypeCode, TypeReleases}, DefaultForkRepoUnits) }) - t.Run("actions_disbaled", func(t *testing.T) { + t.Run("actions_disabled", func(t *testing.T) { setting.Repository.DisabledRepoUnits = []string{"repo.issues"} setting.Repository.DefaultRepoUnits = []string{"repo.code", "repo.releases", "repo.issues", "repo.pulls"} setting.Repository.DefaultForkRepoUnits = []string{"repo.releases"} From d9ceed4c2ab13f2690a36e4416e4a8f22299d580 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Fri, 5 May 2023 15:48:32 +0800 Subject: [PATCH 10/11] append DisabledRepoUnits when initializing setting --- models/unit/unit.go | 11 ----------- models/unit/unit_test.go | 13 ------------- modules/setting/repository.go | 4 ++++ 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/models/unit/unit.go b/models/unit/unit.go index 34711ed5c650d..ef15ad49fc6bd 100644 --- a/models/unit/unit.go +++ b/models/unit/unit.go @@ -157,25 +157,14 @@ func LoadUnitConfig() { log.Warn("Invalid keys in disabled repo units: %s", strings.Join(invalidKeys, ", ")) } - var isActionsDisabled bool // Check that must units are not disabled for i, disabledU := range DisabledRepoUnits { - if disabledU == TypeActions { - isActionsDisabled = true - } if !disabledU.CanDisable() { log.Warn("Not allowed to global disable unit %s", disabledU.String()) DisabledRepoUnits = append(DisabledRepoUnits[:i], DisabledRepoUnits[i+1:]...) } } - // Check that actions.ENABLED - if !isActionsDisabled && !setting.Actions.Enabled { - // not disabled in `repo.DISABLED_REPO_UNITS` but disabled in `actions.ENABLED` - // also append into the slice of DisabledRepoUnits - DisabledRepoUnits = append(DisabledRepoUnits, TypeActions) - } - setDefaultRepoUnits, invalidKeys := FindUnitTypes(setting.Repository.DefaultRepoUnits...) if len(invalidKeys) > 0 { log.Warn("Invalid keys in default repo units: %s", strings.Join(invalidKeys, ", ")) diff --git a/models/unit/unit_test.go b/models/unit/unit_test.go index 88fd54ad2cd6d..50d781719771d 100644 --- a/models/unit/unit_test.go +++ b/models/unit/unit_test.go @@ -27,7 +27,6 @@ func TestLoadUnitConfig(t *testing.T) { setting.Repository.DisabledRepoUnits = []string{"repo.issues"} setting.Repository.DefaultRepoUnits = []string{"repo.code", "repo.releases", "repo.issues", "repo.pulls"} setting.Repository.DefaultForkRepoUnits = []string{"repo.releases"} - setting.Actions.Enabled = true LoadUnitConfig() assert.Equal(t, []Type{TypeIssues}, DisabledRepoUnits) assert.Equal(t, []Type{TypeCode, TypeReleases, TypePullRequests}, DefaultRepoUnits) @@ -37,7 +36,6 @@ func TestLoadUnitConfig(t *testing.T) { setting.Repository.DisabledRepoUnits = []string{"repo.issues", "invalid.1"} setting.Repository.DefaultRepoUnits = []string{"repo.code", "invalid.2", "repo.releases", "repo.issues", "repo.pulls"} setting.Repository.DefaultForkRepoUnits = []string{"invalid.3", "repo.releases"} - setting.Actions.Enabled = true LoadUnitConfig() assert.Equal(t, []Type{TypeIssues}, DisabledRepoUnits) assert.Equal(t, []Type{TypeCode, TypeReleases, TypePullRequests}, DefaultRepoUnits) @@ -47,20 +45,9 @@ func TestLoadUnitConfig(t *testing.T) { setting.Repository.DisabledRepoUnits = []string{"repo.issues", "repo.issues"} setting.Repository.DefaultRepoUnits = []string{"repo.code", "repo.releases", "repo.issues", "repo.pulls", "repo.code"} setting.Repository.DefaultForkRepoUnits = []string{"repo.releases", "repo.releases"} - setting.Actions.Enabled = true LoadUnitConfig() assert.Equal(t, []Type{TypeIssues}, DisabledRepoUnits) assert.Equal(t, []Type{TypeCode, TypeReleases, TypePullRequests}, DefaultRepoUnits) assert.Equal(t, []Type{TypeCode, TypeReleases}, DefaultForkRepoUnits) }) - t.Run("actions_disabled", func(t *testing.T) { - setting.Repository.DisabledRepoUnits = []string{"repo.issues"} - setting.Repository.DefaultRepoUnits = []string{"repo.code", "repo.releases", "repo.issues", "repo.pulls"} - setting.Repository.DefaultForkRepoUnits = []string{"repo.releases"} - setting.Actions.Enabled = false - LoadUnitConfig() - assert.Equal(t, []Type{TypeIssues, TypeActions}, DisabledRepoUnits) - assert.Equal(t, []Type{TypeCode, TypeReleases, TypePullRequests}, DefaultRepoUnits) - assert.Equal(t, []Type{TypeCode, TypeReleases}, DefaultForkRepoUnits) - }) } diff --git a/modules/setting/repository.go b/modules/setting/repository.go index 20ed6d0dcd559..56e7e6f4aca56 100644 --- a/modules/setting/repository.go +++ b/modules/setting/repository.go @@ -308,6 +308,10 @@ func loadRepositoryFrom(rootCfg ConfigProvider) { Repository.DisabledRepoUnits = append(Repository.DisabledRepoUnits, "repo.packages") } + if !rootCfg.Section("actions").Key("ENABLED").MustBool(true) { + Repository.DisabledRepoUnits = append(Repository.DisabledRepoUnits, "repo.actions") + } + // Handle default trustmodel settings Repository.Signing.DefaultTrustModel = strings.ToLower(strings.TrimSpace(Repository.Signing.DefaultTrustModel)) if Repository.Signing.DefaultTrustModel == "default" { From 0e5143f4ac781e37c4958ddba117c0adb97bc828 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Fri, 5 May 2023 15:49:19 +0800 Subject: [PATCH 11/11] update --- models/unit/unit.go | 1 - 1 file changed, 1 deletion(-) diff --git a/models/unit/unit.go b/models/unit/unit.go index ef15ad49fc6bd..3d5a8842cd638 100644 --- a/models/unit/unit.go +++ b/models/unit/unit.go @@ -156,7 +156,6 @@ func LoadUnitConfig() { if len(invalidKeys) > 0 { log.Warn("Invalid keys in disabled repo units: %s", strings.Join(invalidKeys, ", ")) } - // Check that must units are not disabled for i, disabledU := range DisabledRepoUnits { if !disabledU.CanDisable() {