tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-23 02:38:35 +00:00
Code Releases Activity

Finish team list, create new team, join/leave team page

Browse Source
This commit is contained in:
Unknwon
2014-08-16 16:21:17 +08:00
parent 78add502d7
commit bba707de36
33 changed files with 534 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
routers/org/members.go
View File

@@ -14,13 +14,13 @@ import (
)
const (
MEMBERS base.TplName = "org/members"
INVITE base.TplName = "org/invite"
MEMBERS base.TplName = "org/member/members"
MEMBER_INVITE base.TplName = "org/member/invite"
)
func Members(ctx *middleware.Context) {
org := ctx.Org.Organization
ctx.Data["Title"] = org.Name
ctx.Data["Title"] = org.FullName
ctx.Data["PageIsOrgMembers"] = true
if err := org.GetMembers(); err != nil {
@@ -60,6 +60,18 @@ func MembersAction(ctx *middleware.Context) {
return
}
err = org.RemoveMember(uid)
if err == models.ErrLastOrgOwner {
ctx.Flash.Error(ctx.Tr("form.last_org_owner"))
ctx.Redirect(ctx.Org.OrgLink + "/members")
return
}
case "leave":
err = org.RemoveMember(ctx.User.Id)
if err == models.ErrLastOrgOwner {
ctx.Flash.Error(ctx.Tr("form.last_org_owner"))
ctx.Redirect(ctx.Org.OrgLink + "/members")
return
}
}
if err != nil {
@@ -75,7 +87,7 @@ func MembersAction(ctx *middleware.Context) {
func Invitation(ctx *middleware.Context) {
org := ctx.Org.Organization
ctx.Data["Title"] = org.Name
ctx.Data["Title"] = org.FullName
ctx.Data["PageIsOrgMembers"] = true
if ctx.Req.Method == "POST" {
@@ -101,5 +113,5 @@ func Invitation(ctx *middleware.Context) {
return
}
ctx.HTML(200, INVITE)
ctx.HTML(200, MEMBER_INVITE)
}

2
routers/org/org.go
View File

@@ -19,7 +19,7 @@ const (
func Home(ctx *middleware.Context) {
org := ctx.Org.Organization
ctx.Data["Title"] = org.Name
ctx.Data["Title"] = org.FullName
repos, err := models.GetRepositories(org.Id, ctx.IsSigned && org.IsOrgMember(ctx.User.Id))
if err != nil {

102
routers/org/teams.go
View File

@@ -13,31 +13,22 @@ import (
)
const (
TEAMS base.TplName = "org/teams"
TEAM_NEW base.TplName = "org/team_new"
TEAMS base.TplName = "org/team/teams"
TEAM_NEW base.TplName = "org/team/new"
)
func Teams(ctx *middleware.Context) {
ctx.Data["Title"] = "Organization " + ctx.Params(":org") + " Teams"
org := ctx.Org.Organization
ctx.Data["Title"] = org.FullName
ctx.Data["PageIsOrgTeams"] = true
org, err := models.GetUserByName(ctx.Params(":org"))
if err != nil {
if err == models.ErrUserNotExist {
ctx.Handle(404, "org.Teams(GetUserByName)", err)
} else {
ctx.Handle(500, "org.Teams(GetUserByName)", err)
}
return
}
ctx.Data["Org"] = org
if err = org.GetTeams(); err != nil {
ctx.Handle(500, "org.Teams(GetTeams)", err)
if err := org.GetTeams(); err != nil {
ctx.Handle(500, "GetTeams", err)
return
}
for _, t := range org.Teams {
if err = t.GetMembers(); err != nil {
ctx.Handle(500, "org.Home(GetMembers)", err)
if err := t.GetMembers(); err != nil {
ctx.Handle(500, "GetMembers", err)
return
}
}
@@ -46,44 +37,39 @@ func Teams(ctx *middleware.Context) {
ctx.HTML(200, TEAMS)
}
func NewTeam(ctx *middleware.Context) {
org, err := models.GetUserByName(ctx.Params(":org"))
func TeamsAction(ctx *middleware.Context) {
var err error
switch ctx.Params(":action") {
case "join":
err = models.AddTeamMember(ctx.Org.Organization.Id, ctx.Org.Team.Id, ctx.User.Id)
case "leave":
err = models.RemoveMember(ctx.Org.Organization.Id, ctx.Org.Team.Id, ctx.User.Id)
}
if err != nil {
if err == models.ErrUserNotExist {
ctx.Handle(404, "org.NewTeam(GetUserByName)", err)
} else {
ctx.Handle(500, "org.NewTeam(GetUserByName)", err)
}
return
}
ctx.Data["Org"] = org
// Check ownership of organization.
if !org.IsOrgOwner(ctx.User.Id) {
ctx.Error(403)
log.Error(4, "Action(%s): %v", ctx.Params(":action"), err)
ctx.JSON(200, map[string]interface{}{
"ok": false,
"err": err.Error(),
})
return
}
ctx.Redirect(ctx.Org.OrgLink + "/teams")
}
func NewTeam(ctx *middleware.Context) {
ctx.Data["Title"] = ctx.Org.Organization.FullName
ctx.Data["PageIsOrgTeams"] = true
ctx.Data["PageIsOrgTeamsNew"] = true
ctx.Data["Team"] = &models.Team{}
ctx.HTML(200, TEAM_NEW)
}
func NewTeamPost(ctx *middleware.Context, form auth.CreateTeamForm) {
org, err := models.GetUserByName(ctx.Params(":org"))
if err != nil {
if err == models.ErrUserNotExist {
ctx.Handle(404, "org.NewTeamPost(GetUserByName)", err)
} else {
ctx.Handle(500, "org.NewTeamPost(GetUserByName)", err)
}
return
}
ctx.Data["Org"] = org
// Check ownership of organization.
if !org.IsOrgOwner(ctx.User.Id) {
ctx.Error(403)
return
}
ctx.Data["Title"] = ctx.Org.Organization.FullName
ctx.Data["PageIsOrgTeams"] = true
ctx.Data["PageIsOrgTeamsNew"] = true
ctx.Data["Team"] = &models.Team{}
if ctx.HasError() {
ctx.HTML(200, TEAM_NEW)
@@ -104,23 +90,29 @@ func NewTeamPost(ctx *middleware.Context, form auth.CreateTeamForm) {
return
}
org := ctx.Org.Organization
t := &models.Team{
OrgId: org.Id,
Name: form.TeamName,
Description: form.Description,
Authorize: auth,
}
if err = models.NewTeam(t); err != nil {
if err == models.ErrTeamAlreadyExist {
if err := models.NewTeam(t); err != nil {
switch err {
case models.ErrTeamNameIllegal:
ctx.Data["Err_TeamName"] = true
ctx.RenderWithErr("Team name has already been used", TEAM_NEW, &form)
} else {
ctx.Handle(500, "org.NewTeamPost(NewTeam)", err)
ctx.RenderWithErr(ctx.Tr("form.illegal_team_name"), TEAM_NEW, &form)
case models.ErrTeamAlreadyExist:
ctx.Data["Err_TeamName"] = true
ctx.RenderWithErr(ctx.Tr("form.team_name_been_taken"), TEAM_NEW, &form)
default:
ctx.Handle(500, "NewTeam", err)
}
return
}
log.Trace("%s Team created: %s/%s", ctx.Req.RequestURI, org.Name, t.Name)
ctx.Redirect("/org/" + org.LowerName + "/teams/" + t.LowerName)
log.Trace("Team created: %s/%s", org.Name, t.Name)
ctx.Redirect(ctx.Org.OrgLink + "/teams/" + t.LowerName)
}
func EditTeam(ctx *middleware.Context) {