diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-11-22 23:21:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 23:21:55 +0800 |
| commit | baed01f24753afb600a2984dcb9bcda0bb8502b6 (patch) | |
| tree | 5621ef980b6b0067a21c86be7e4808d83c0538ab /modules | |
| parent | c2ab19888f92fbdec4276a16d224e8de80d1d1dd (diff) | |
| download | gitea-baed01f24753afb600a2984dcb9bcda0bb8502b6.tar.gz gitea-baed01f24753afb600a2984dcb9bcda0bb8502b6.zip | |
Remove unnecessary attributes of User struct (#17745)
* Remove unnecessary functions of User struct
* Move more database methods out of user struct
* Move more database methods out of user struct
* Fix template failure
* Fix bug
* Remove finished FIXME
* remove unnecessary code
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/context/org.go | 4 | ||||
| -rw-r--r-- | modules/context/repo.go | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/modules/context/org.go b/modules/context/org.go index 11521c452b..d4159a32a7 100644 --- a/modules/context/org.go +++ b/modules/context/org.go @@ -117,6 +117,10 @@ func HandleOrgAssignment(ctx *Context, args ...bool) { } ctx.Data["IsOrganizationOwner"] = ctx.Org.IsOwner ctx.Data["IsOrganizationMember"] = ctx.Org.IsMember + ctx.Data["IsPublicMember"] = func(uid int64) bool { + is, _ := models.IsPublicMembership(ctx.Org.Organization.ID, uid) + return is + } ctx.Data["CanCreateOrgRepo"] = ctx.Org.CanCreateOrgRepo ctx.Org.OrgLink = org.AsUser().OrganisationLink() diff --git a/modules/context/repo.go b/modules/context/repo.go index e3d66fc3b9..c96d34f2fc 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -491,8 +491,8 @@ func RepoAssignment(ctx *Context) (cancel context.CancelFunc) { ctx.Data["CanWriteIssues"] = ctx.Repo.CanWrite(unit_model.TypeIssues) ctx.Data["CanWritePulls"] = ctx.Repo.CanWrite(unit_model.TypePullRequests) - if ctx.Data["CanSignedUserFork"], err = ctx.Repo.Repository.CanUserFork(ctx.User); err != nil { - ctx.ServerError("CanUserFork", err) + if ctx.Data["CanSignedUserFork"], err = models.CanUserForkRepo(ctx.User, ctx.Repo.Repository); err != nil { + ctx.ServerError("CanSignedUserFork", err) return } @@ -577,7 +577,8 @@ func RepoAssignment(ctx *Context) (cancel context.CancelFunc) { ctx.Data["BranchName"] = ctx.Repo.BranchName // People who have push access or have forked repository can propose a new pull request. - canPush := ctx.Repo.CanWrite(unit_model.TypeCode) || (ctx.IsSigned && ctx.User.HasForkedRepo(ctx.Repo.Repository.ID)) + canPush := ctx.Repo.CanWrite(unit_model.TypeCode) || + (ctx.IsSigned && models.HasForkedRepo(ctx.User.ID, ctx.Repo.Repository.ID)) canCompare := false // Pull request is allowed if this is a fork repository |