fix test

Author: wxiaoguang

models/migrations/v1_23/v297.go

@@ -4,9 +4,9 @@
 package v1_23 //nolint
 
 import (
-	"xorm.io/xorm"
-
 	"code.gitea.io/gitea/models/perm"
+
+	"xorm.io/xorm"
 )
 
 func AddRepoUnitEveryoneAccessMode(x *xorm.Engine) error {

models/perm/access/repo_permission.go

@@ -127,9 +127,9 @@ func (p *Permission) LogString() string {
 }
 
 func applyDefaultUserRepoPermission(user *user_model.User, perm *Permission) {
-	if user != nil {
+	if user != nil && user.ID > 0 {
 		for _, u := range perm.Units {
-			if u.EveryoneAccessMode != perm_model.AccessModeUnset && u.EveryoneAccessMode > perm.UnitsMode[u.Type] {
+			if u.EveryoneAccessMode > 0 && u.EveryoneAccessMode > perm.UnitsMode[u.Type] {
 				perm.UnitsMode[u.Type] = u.EveryoneAccessMode
 			}
 		}

models/perm/access/repo_permission_test.go

@@ -0,0 +1,34 @@
+// Copyright 2024 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package access
+
+import (
+	"testing"
+
+	perm_model "code.gitea.io/gitea/models/perm"
+	repo_model "code.gitea.io/gitea/models/repo"
+	"code.gitea.io/gitea/models/unit"
+	user_model "code.gitea.io/gitea/models/user"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestApplyDefaultUserRepoPermission(t *testing.T) {
+	perm := Permission{
+		AccessMode: perm_model.AccessModeNone,
+		UnitsMode:  map[unit.Type]perm_model.AccessMode{},
+	}
+
+	perm.Units = []*repo_model.RepoUnit{
+		{Type: unit.TypeUncyclo, EveryoneAccessMode: perm_model.AccessModeNone},
+	}
+	applyDefaultUserRepoPermission(nil, &perm)
+	assert.False(t, perm.CanRead(unit.TypeUncyclo))
+
+	perm.Units = []*repo_model.RepoUnit{
+		{Type: unit.TypeUncyclo, EveryoneAccessMode: perm_model.AccessModeRead},
+	}
+	applyDefaultUserRepoPermission(&user_model.User{ID: 1}, &perm)
+	assert.True(t, perm.CanRead(unit.TypeUncyclo))
+}

options/locale/locale_en-US.ini

@@ -885,6 +885,7 @@ repo_and_org_access = Repository and Organization Access
 permissions_public_only = Public only
 permissions_access_all = All (public, private, and limited)
 select_permissions = Select permissions
+permission_unset = (unset)
 permission_no_access = No Access
 permission_read = Read
 permission_write = Read and Write

templates/repo/settings/options.tmpl

@@ -345,9 +345,9 @@
 						{{$unitBuiltinUncyclo := .Repository.MustGetUnit ctx $.UnitTypeUncyclo}}
 						<label>{{ctx.Locale.Tr "repo.settings.default_wiki_everyone_access"}}</label>
 						<select name="default_wiki_everyone_access" class="ui dropdown">
-							<option value="unset" {{Iif (eq $unitBuiltinUncyclo.EveryoneAccessMode -1) "selected"}}>unset</option>
-							<option value="read" {{Iif (eq $unitBuiltinUncyclo.EveryoneAccessMode 1) "selected"}}>read</option>
-							<option value="write" {{Iif (eq $unitBuiltinUncyclo.EveryoneAccessMode 2) "selected"}}>write</option>
+							<option value="unset" {{Iif (eq $unitBuiltinUncyclo.EveryoneAccessMode -1) "selected"}}>{{ctx.Locale.Tr "settings.permission_unset"}}</option>
+							<option value="read" {{Iif (eq $unitBuiltinUncyclo.EveryoneAccessMode 1) "selected"}}>{{ctx.Locale.Tr "settings.permission_read"}}</option>
+							<option value="write" {{Iif (eq $unitBuiltinUncyclo.EveryoneAccessMode 2) "selected"}}>{{ctx.Locale.Tr "settings.permission_write"}}</option>
 						</select>
 					</div>
 					<div class="field">

tests/integration/api_team_test.go

@@ -126,7 +126,7 @@ func TestAPITeam(t *testing.T) {
 	apiTeam = api.Team{}
 	DecodeJSON(t, resp, &apiTeam)
 	checkTeamResponse(t, "ReadTeam1", &apiTeam, teamRead.Name, *teamToEditDesc.Description, teamRead.IncludesAllRepositories,
-		teamRead.AccessMode.String(), teamRead.GetUnitNames(), teamRead.GetUnitsMap())
+		teamRead.AccessMode.ToString(), teamRead.GetUnitNames(), teamRead.GetUnitsMap())
 
 	// Delete team.
 	req = NewRequestf(t, "DELETE", "/api/v1/teams/%d", teamID).
@@ -197,7 +197,7 @@ func TestAPITeam(t *testing.T) {
 	DecodeJSON(t, resp, &apiTeam)
 	assert.NoError(t, teamRead.LoadUnits(db.DefaultContext))
 	checkTeamResponse(t, "ReadTeam2", &apiTeam, teamRead.Name, *teamToEditDesc.Description, teamRead.IncludesAllRepositories,
-		teamRead.AccessMode.String(), teamRead.GetUnitNames(), teamRead.GetUnitsMap())
+		teamRead.AccessMode.ToString(), teamRead.GetUnitNames(), teamRead.GetUnitsMap())
 
 	// Delete team.
 	req = NewRequestf(t, "DELETE", "/api/v1/teams/%d", teamID).