opensource/gitea
1
0
Fork 0
mirror of https://gitcode.com/gitea/gitea.git synced 2025-06-26 23:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Finish Teams page

Browse Source
This commit is contained in:
Unknown
2014-06-29 16:30:41 -04:00
parent 99713e1180
commit e4ea5cf598
11 changed files with 247 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
routers/org/members.go Normal file
View File

@ -0,0 +1,16 @@
// Copyright 2014 The Gogs Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package org
import (
"github.com/go-martini/martini"
"github.com/gogits/gogs/modules/middleware"
)
func Members(ctx *middleware.Context, params martini.Params) {
ctx.Data["Title"] = "Organization " + params["org"] + " Members"
ctx.HTML(200, "org/members")
}

9
routers/org/org.go
View File

@ -36,7 +36,7 @@ func Home(ctx *middleware.Context, params martini.Params) {
ctx.Data["Org"] = org
ctx.Data["Repos"], err = models.GetRepositories(org.Id,
ctx.IsSigned && models.IsOrganizationMember(org.Id, ctx.User.Id))
ctx.IsSigned && org.IsOrgMember(ctx.User.Id))
if err != nil {
ctx.Handle(500, "org.Home(GetRepositories)", err)
return
@ -57,11 +57,6 @@ func Home(ctx *middleware.Context, params martini.Params) {
ctx.HTML(200, HOME)
}
func Members(ctx *middleware.Context, params martini.Params) {
ctx.Data["Title"] = "Organization " + params["org"] + " Members"
ctx.HTML(200, "org/members")
}
func New(ctx *middleware.Context) {
ctx.Data["Title"] = "Create An Organization"
ctx.HTML(200, NEW)
@ -206,7 +201,7 @@ func DeletePost(ctx *middleware.Context, params martini.Params) {
}
ctx.Data["Org"] = org
if !models.IsOrganizationOwner(org.Id, ctx.User.Id) {
if !org.IsOrgOwner(ctx.User.Id) {
ctx.Error(403)
return
}

47
routers/org/teams.go
View File

@ -1,21 +1,56 @@
// Copyright 2014 The Gogs Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package org
import (
"github.com/go-martini/martini"
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/middleware"
)
const (
TEAMS base.TplName = "org/teams"
)
func Teams(ctx *middleware.Context, params martini.Params) {
ctx.Data["Title"] = "Organization "+params["org"]+" Teams"
ctx.HTML(200, "org/teams")
ctx.Data["Title"] = "Organization " + params["org"] + " Teams"
org, err := models.GetUserByName(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)
return
}
for _, t := range org.Teams {
if err = t.GetMembers(); err != nil {
ctx.Handle(500, "org.Home(GetMembers)", err)
return
}
}
ctx.Data["Teams"] = org.Teams
ctx.HTML(200, TEAMS)
}
func NewTeam(ctx *middleware.Context, params martini.Params) {
ctx.Data["Title"] = "Organization "+params["org"]+" New Team"
ctx.Data["Title"] = "Organization " + params["org"] + " New Team"
ctx.HTML(200, "org/new_team")
}
func EditTeam(ctx *middleware.Context, params martini.Params){
ctx.Data["Title"] = "Organization "+params["org"]+" Edit Team"
ctx.HTML(200,"org/edit_team")
func EditTeam(ctx *middleware.Context, params martini.Params) {
ctx.Data["Title"] = "Organization " + params["org"] + " Edit Team"
ctx.HTML(200, "org/edit_team")
}

2
routers/repo/repo.go
View File

@ -90,7 +90,7 @@ func CreatePost(ctx *middleware.Context, form auth.CreateRepoForm) {
}
// Check ownership of organization.
if !models.IsOrganizationOwner(u.Id, ctx.User.Id) {
if !u.IsOrgOwner(ctx.User.Id) {
ctx.Error(403)
return
}

2
routers/repo/setting.go
View File

@ -123,7 +123,7 @@ func SettingPost(ctx *middleware.Context, form auth.RepoSettingForm) {
}
if ctx.Repo.Owner.IsOrganization() &&
!models.IsOrganizationOwner(ctx.Repo.Owner.Id, ctx.User.Id) {
!ctx.Repo.Owner.IsOrgOwner(ctx.User.Id) {
ctx.Error(403)
return
}