summaryrefslogtreecommitdiffstats
path: root/models/organization
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2022-12-10 03:46:31 +0100
committerGitHub <noreply@github.com>2022-12-10 03:46:31 +0100
commit68704532c28cf09db96c988291b2f82c5e615984 (patch)
treec6537092dc11054f96b202fdb957755ed116cd99 /models/organization
parentChange ID pattern of raw content container for issue (#21966) (diff)
downloadforgejo-68704532c28cf09db96c988291b2f82c5e615984.tar.xz
forgejo-68704532c28cf09db96c988291b2f82c5e615984.zip
Rename almost all Ctx functions (#22071)
Diffstat (limited to 'models/organization')
-rw-r--r--models/organization/org.go2
-rw-r--r--models/organization/org_user.go4
-rw-r--r--models/organization/team.go12
3 files changed, 6 insertions, 12 deletions
diff --git a/models/organization/org.go b/models/organization/org.go
index a5b07d5aae..b3d77b4ec6 100644
--- a/models/organization/org.go
+++ b/models/organization/org.go
@@ -106,7 +106,7 @@ func (org *Organization) IsOrgMember(uid int64) (bool, error) {
// CanCreateOrgRepo returns true if given user can create repo in organization
func (org *Organization) CanCreateOrgRepo(uid int64) (bool, error) {
- return CanCreateOrgRepo(org.ID, uid)
+ return CanCreateOrgRepo(db.DefaultContext, org.ID, uid)
}
func (org *Organization) getTeam(ctx context.Context, name string) (*Team, error) {
diff --git a/models/organization/org_user.go b/models/organization/org_user.go
index d514e401ba..e5cbfe6c0f 100644
--- a/models/organization/org_user.go
+++ b/models/organization/org_user.go
@@ -73,8 +73,8 @@ func IsPublicMembership(orgID, uid int64) (bool, error) {
}
// CanCreateOrgRepo returns true if user can create repo in organization
-func CanCreateOrgRepo(orgID, uid int64) (bool, error) {
- return db.GetEngine(db.DefaultContext).
+func CanCreateOrgRepo(ctx context.Context, orgID, uid int64) (bool, error) {
+ return db.GetEngine(ctx).
Where(builder.Eq{"team.can_create_org_repo": true}).
Join("INNER", "team_user", "team_user.team_id = team.id").
And("team_user.uid = ?", uid).
diff --git a/models/organization/team.go b/models/organization/team.go
index 86ea30c801..55d3f17276 100644
--- a/models/organization/team.go
+++ b/models/organization/team.go
@@ -242,18 +242,12 @@ func (t *Team) LoadMembers(ctx context.Context) (err error) {
}
// UnitEnabled returns if the team has the given unit type enabled
-func (t *Team) UnitEnabled(tp unit.Type) bool {
- return t.UnitAccessMode(tp) > perm.AccessModeNone
+func (t *Team) UnitEnabled(ctx context.Context, tp unit.Type) bool {
+ return t.UnitAccessMode(ctx, tp) > perm.AccessModeNone
}
// UnitAccessMode returns if the team has the given unit type enabled
-// it is called in templates, should not be replaced by `UnitAccessModeCtx(ctx ...)`
-func (t *Team) UnitAccessMode(tp unit.Type) perm.AccessMode { // Notice: It will be used in template, don't remove it directly
- return t.UnitAccessModeCtx(db.DefaultContext, tp)
-}
-
-// UnitAccessModeCtx returns if the team has the given unit type enabled
-func (t *Team) UnitAccessModeCtx(ctx context.Context, tp unit.Type) perm.AccessMode {
+func (t *Team) UnitAccessMode(ctx context.Context, tp unit.Type) perm.AccessMode {
if err := t.getUnits(ctx); err != nil {
log.Warn("Error loading team (ID: %d) units: %s", t.ID, err.Error())
}