diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-11-10 03:57:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-09 20:57:58 +0100 |
| commit | 99b2858e628d92bba252be72def409af77af735b (patch) | |
| tree | 56159cf10b271307911e6f01626c0c3efba789ab /models/branches.go | |
| parent | b6b1e716654fec3b16d245ef65cf42e57e1bb5b6 (diff) | |
| download | gitea-99b2858e628d92bba252be72def409af77af735b.tar.gz gitea-99b2858e628d92bba252be72def409af77af735b.zip | |
Move unit into models/unit/ (#17576)
* Move unit into models/unit/
* Rename unit.UnitType as unit.Type
Diffstat (limited to 'models/branches.go')
| -rw-r--r-- | models/branches.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/models/branches.go b/models/branches.go index caca9e23fe..50de52a277 100644 --- a/models/branches.go +++ b/models/branches.go @@ -11,6 +11,7 @@ import ( "time" "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" @@ -74,7 +75,7 @@ func (protectBranch *ProtectedBranch) CanUserPush(userID int64) bool { } else if repo, err := GetRepositoryByID(protectBranch.RepoID); err != nil { log.Error("GetRepositoryByID: %v", err) return false - } else if writeAccess, err := HasAccessUnit(user, repo, UnitTypeCode, AccessModeWrite); err != nil { + } else if writeAccess, err := HasAccessUnit(user, repo, unit.TypeCode, AccessModeWrite); err != nil { log.Error("HasAccessUnit: %v", err) return false } else { @@ -102,7 +103,7 @@ func (protectBranch *ProtectedBranch) CanUserPush(userID int64) bool { func (protectBranch *ProtectedBranch) IsUserMergeWhitelisted(userID int64, permissionInRepo Permission) bool { if !protectBranch.EnableMergeWhitelist { // Then we need to fall back on whether the user has write permission - return permissionInRepo.CanWrite(UnitTypeCode) + return permissionInRepo.CanWrite(unit.TypeCode) } if base.Int64sContains(protectBranch.MergeWhitelistUserIDs, userID) { @@ -134,7 +135,7 @@ func (protectBranch *ProtectedBranch) isUserOfficialReviewer(e db.Engine, user * if !protectBranch.EnableApprovalsWhitelist { // Anyone with write access is considered official reviewer - writeAccess, err := hasAccessUnit(e, user, repo, UnitTypeCode, AccessModeWrite) + writeAccess, err := hasAccessUnit(e, user, repo, unit.TypeCode, AccessModeWrite) if err != nil { return false, err } @@ -454,7 +455,7 @@ func updateUserWhitelist(repo *Repository, currentWhitelist, newWhitelist []int6 return nil, fmt.Errorf("GetUserRepoPermission [user_id: %d, repo_id: %d]: %v", userID, repo.ID, err) } - if !perm.CanWrite(UnitTypeCode) { + if !perm.CanWrite(unit.TypeCode) { continue // Drop invalid user ID } |