forked from forgejo/forgejo
Finish new organization members and invitation page
This commit is contained in:
parent
3e32b14ad4
commit
36b4c57ff1
24 changed files with 450 additions and 208 deletions
|
@ -13,8 +13,9 @@ import (
|
|||
func OrgAssignment(redirect bool, args ...bool) macaron.Handler {
|
||||
return func(ctx *Context) {
|
||||
var (
|
||||
requireMember bool
|
||||
requireOwner bool
|
||||
requireMember bool
|
||||
requireOwner bool
|
||||
requireAdminTeam bool
|
||||
)
|
||||
if len(args) >= 1 {
|
||||
requireMember = args[0]
|
||||
|
@ -22,6 +23,9 @@ func OrgAssignment(redirect bool, args ...bool) macaron.Handler {
|
|||
if len(args) >= 2 {
|
||||
requireOwner = args[1]
|
||||
}
|
||||
if len(args) >= 3 {
|
||||
requireAdminTeam = args[2]
|
||||
}
|
||||
|
||||
orgName := ctx.Params(":org")
|
||||
|
||||
|
@ -43,13 +47,24 @@ func OrgAssignment(redirect bool, args ...bool) macaron.Handler {
|
|||
ctx.Org.IsOwner = ctx.Org.Organization.IsOrgOwner(ctx.User.Id)
|
||||
if ctx.Org.IsOwner {
|
||||
ctx.Org.IsMember = true
|
||||
ctx.Org.IsAdminTeam = true
|
||||
} else {
|
||||
ctx.Org.IsMember = ctx.Org.Organization.IsOrgMember(ctx.User.Id)
|
||||
if ctx.Org.Organization.IsOrgMember(ctx.User.Id) {
|
||||
ctx.Org.IsMember = true
|
||||
// TODO: ctx.Org.IsAdminTeam
|
||||
}
|
||||
}
|
||||
}
|
||||
if (requireMember && !ctx.Org.IsMember) || (requireOwner && !ctx.Org.IsOwner) {
|
||||
if (requireMember && !ctx.Org.IsMember) ||
|
||||
(requireOwner && !ctx.Org.IsOwner) ||
|
||||
(requireAdminTeam && !ctx.Org.IsAdminTeam) {
|
||||
ctx.Handle(404, "OrgAssignment", err)
|
||||
return
|
||||
}
|
||||
ctx.Data["IsAdminTeam"] = ctx.Org.IsAdminTeam
|
||||
ctx.Data["IsOrganizationOwner"] = ctx.Org.IsOwner
|
||||
|
||||
ctx.Org.OrgLink = "/org/" + ctx.Org.Organization.Name
|
||||
ctx.Data["OrgLink"] = ctx.Org.OrgLink
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue