aboutsummaryrefslogtreecommitdiff
path: root/internal/route/org
diff options
context:
space:
mode:
Diffstat (limited to 'internal/route/org')
-rw-r--r--internal/route/org/members.go21
-rw-r--r--internal/route/org/org.go13
-rw-r--r--internal/route/org/setting.go29
-rw-r--r--internal/route/org/teams.go52
4 files changed, 56 insertions, 59 deletions
diff --git a/internal/route/org/members.go b/internal/route/org/members.go
index fc22ad59..d29d1896 100644
--- a/internal/route/org/members.go
+++ b/internal/route/org/members.go
@@ -11,7 +11,6 @@ import (
"gogs.io/gogs/internal/conf"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
- "gogs.io/gogs/internal/db/errors"
)
const (
@@ -25,12 +24,12 @@ func Members(c *context.Context) {
c.Data["PageIsOrgMembers"] = true
if err := org.GetMembers(); err != nil {
- c.Handle(500, "GetMembers", err)
+ c.Error(err, "get members")
return
}
c.Data["Members"] = org.Members
- c.HTML(200, MEMBERS)
+ c.Success(MEMBERS)
}
func MembersAction(c *context.Context) {
@@ -45,19 +44,19 @@ func MembersAction(c *context.Context) {
switch c.Params(":action") {
case "private":
if c.User.ID != uid && !c.Org.IsOwner {
- c.Error(404)
+ c.NotFound()
return
}
err = db.ChangeOrgUserStatus(org.ID, uid, false)
case "public":
if c.User.ID != uid && !c.Org.IsOwner {
- c.Error(404)
+ c.NotFound()
return
}
err = db.ChangeOrgUserStatus(org.ID, uid, true)
case "remove":
if !c.Org.IsOwner {
- c.Error(404)
+ c.NotFound()
return
}
err = org.RemoveMember(uid)
@@ -77,7 +76,7 @@ func MembersAction(c *context.Context) {
if err != nil {
log.Error("Action(%s): %v", c.Params(":action"), err)
- c.JSON(200, map[string]interface{}{
+ c.JSONSuccess( map[string]interface{}{
"ok": false,
"err": err.Error(),
})
@@ -100,17 +99,17 @@ func Invitation(c *context.Context) {
uname := c.Query("uname")
u, err := db.GetUserByName(uname)
if err != nil {
- if errors.IsUserNotExist(err) {
+ if db.IsErrUserNotExist(err) {
c.Flash.Error(c.Tr("form.user_not_exist"))
c.Redirect(c.Org.OrgLink + "/invitations/new")
} else {
- c.Handle(500, " GetUserByName", err)
+ c.Error(err, "get user by name")
}
return
}
if err = org.AddMember(u.ID); err != nil {
- c.Handle(500, " AddMember", err)
+ c.Error(err, "add member")
return
}
@@ -119,5 +118,5 @@ func Invitation(c *context.Context) {
return
}
- c.HTML(200, MEMBER_INVITE)
+ c.Success(MEMBER_INVITE)
}
diff --git a/internal/route/org/org.go b/internal/route/org/org.go
index 551dd3e8..e0c358ac 100644
--- a/internal/route/org/org.go
+++ b/internal/route/org/org.go
@@ -7,7 +7,6 @@ package org
import (
log "unknwon.dev/clog/v2"
- "gogs.io/gogs/internal/conf"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
"gogs.io/gogs/internal/form"
@@ -18,15 +17,15 @@ const (
)
func Create(c *context.Context) {
- c.Data["Title"] = c.Tr("new_org")
- c.HTML(200, CREATE)
+ c.Title("new_org")
+ c.Success(CREATE)
}
func CreatePost(c *context.Context, f form.CreateOrg) {
- c.Data["Title"] = c.Tr("new_org")
+ c.Title("new_org")
if c.HasError() {
- c.HTML(200, CREATE)
+ c.Success(CREATE)
return
}
@@ -46,11 +45,11 @@ func CreatePost(c *context.Context, f form.CreateOrg) {
case db.IsErrNamePatternNotAllowed(err):
c.RenderWithErr(c.Tr("org.form.name_pattern_not_allowed", err.(db.ErrNamePatternNotAllowed).Pattern), CREATE, &f)
default:
- c.Handle(500, "CreateOrganization", err)
+ c.Error(err, "create organization")
}
return
}
log.Trace("Organization created: %s", org.Name)
- c.Redirect(conf.Server.Subpath + "/org/" + f.OrgName + "/dashboard")
+ c.RedirectSubpath("/org/" + f.OrgName + "/dashboard")
}
diff --git a/internal/route/org/setting.go b/internal/route/org/setting.go
index aecd8643..61503383 100644
--- a/internal/route/org/setting.go
+++ b/internal/route/org/setting.go
@@ -12,7 +12,6 @@ import (
"gogs.io/gogs/internal/conf"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
- "gogs.io/gogs/internal/db/errors"
"gogs.io/gogs/internal/form"
"gogs.io/gogs/internal/route/user"
)
@@ -24,17 +23,17 @@ const (
)
func Settings(c *context.Context) {
- c.Data["Title"] = c.Tr("org.settings")
+ c.Title("org.settings")
c.Data["PageIsSettingsOptions"] = true
- c.HTML(200, SETTINGS_OPTIONS)
+ c.Success(SETTINGS_OPTIONS)
}
func SettingsPost(c *context.Context, f form.UpdateOrgSetting) {
- c.Data["Title"] = c.Tr("org.settings")
+ c.Title("org.settings")
c.Data["PageIsSettingsOptions"] = true
if c.HasError() {
- c.HTML(200, SETTINGS_OPTIONS)
+ c.Success(SETTINGS_OPTIONS)
return
}
@@ -44,7 +43,7 @@ func SettingsPost(c *context.Context, f form.UpdateOrgSetting) {
if org.LowerName != strings.ToLower(f.Name) {
isExist, err := db.IsUserExist(org.ID, f.Name)
if err != nil {
- c.Handle(500, "IsUserExist", err)
+ c.Error(err, "check if user exists")
return
} else if isExist {
c.Data["OrgName"] = true
@@ -58,7 +57,7 @@ func SettingsPost(c *context.Context, f form.UpdateOrgSetting) {
case db.IsErrNamePatternNotAllowed(err):
c.RenderWithErr(c.Tr("user.form.name_pattern_not_allowed"), SETTINGS_OPTIONS, &f)
default:
- c.Handle(500, "ChangeUserName", err)
+ c.Error(err, "change user name")
}
return
}
@@ -79,7 +78,7 @@ func SettingsPost(c *context.Context, f form.UpdateOrgSetting) {
org.Website = f.Website
org.Location = f.Location
if err := db.UpdateUser(org); err != nil {
- c.Handle(500, "UpdateUser", err)
+ c.Error(err, "update user")
return
}
log.Trace("Organization setting updated: %s", org.Name)
@@ -113,10 +112,10 @@ func SettingsDelete(c *context.Context) {
org := c.Org.Organization
if c.Req.Method == "POST" {
if _, err := db.UserLogin(c.User.Name, c.Query("password"), c.User.LoginSource); err != nil {
- if errors.IsUserNotExist(err) {
+ if db.IsErrUserNotExist(err) {
c.RenderWithErr(c.Tr("form.enterred_invalid_password"), SETTINGS_DELETE, nil)
} else {
- c.ServerError("UserLogin", err)
+ c.Error(err, "authenticate user")
}
return
}
@@ -126,7 +125,7 @@ func SettingsDelete(c *context.Context) {
c.Flash.Error(c.Tr("form.org_still_own_repo"))
c.Redirect(c.Org.OrgLink + "/settings/delete")
} else {
- c.ServerError("DeleteOrganization", err)
+ c.Error(err, "delete organization")
}
} else {
log.Trace("Organization deleted: %s", org.Name)
@@ -139,7 +138,7 @@ func SettingsDelete(c *context.Context) {
}
func Webhooks(c *context.Context) {
- c.Data["Title"] = c.Tr("org.settings")
+ c.Title("org.settings")
c.Data["PageIsSettingsHooks"] = true
c.Data["BaseLink"] = c.Org.OrgLink
c.Data["Description"] = c.Tr("org.settings.hooks_desc")
@@ -147,12 +146,12 @@ func Webhooks(c *context.Context) {
ws, err := db.GetWebhooksByOrgID(c.Org.Organization.ID)
if err != nil {
- c.Handle(500, "GetWebhooksByOrgId", err)
+ c.Error(err, "get webhooks by organization ID")
return
}
c.Data["Webhooks"] = ws
- c.HTML(200, SETTINGS_WEBHOOKS)
+ c.Success(SETTINGS_WEBHOOKS)
}
func DeleteWebhook(c *context.Context) {
@@ -162,7 +161,7 @@ func DeleteWebhook(c *context.Context) {
c.Flash.Success(c.Tr("repo.settings.webhook_deletion_success"))
}
- c.JSON(200, map[string]interface{}{
+ c.JSONSuccess( map[string]interface{}{
"redirect": c.Org.OrgLink + "/settings/hooks",
})
}
diff --git a/internal/route/org/teams.go b/internal/route/org/teams.go
index a4072e97..a703a82d 100644
--- a/internal/route/org/teams.go
+++ b/internal/route/org/teams.go
@@ -5,6 +5,7 @@
package org
import (
+ "net/http"
"path"
"github.com/unknwon/com"
@@ -12,7 +13,6 @@ import (
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
- "gogs.io/gogs/internal/db/errors"
"gogs.io/gogs/internal/form"
)
@@ -30,13 +30,13 @@ func Teams(c *context.Context) {
for _, t := range org.Teams {
if err := t.GetMembers(); err != nil {
- c.Handle(500, "GetMembers", err)
+ c.Error(err, "get members")
return
}
}
c.Data["Teams"] = org.Teams
- c.HTML(200, TEAMS)
+ c.Success(TEAMS)
}
func TeamsAction(c *context.Context) {
@@ -51,7 +51,7 @@ func TeamsAction(c *context.Context) {
switch c.Params(":action") {
case "join":
if !c.Org.IsOwner {
- c.Error(404)
+ c.NotFound()
return
}
err = c.Org.Team.AddMember(c.User.ID)
@@ -59,25 +59,25 @@ func TeamsAction(c *context.Context) {
err = c.Org.Team.RemoveMember(c.User.ID)
case "remove":
if !c.Org.IsOwner {
- c.Error(404)
+ c.NotFound()
return
}
err = c.Org.Team.RemoveMember(uid)
page = "team"
case "add":
if !c.Org.IsOwner {
- c.Error(404)
+ c.NotFound()
return
}
uname := c.Query("uname")
var u *db.User
u, err = db.GetUserByName(uname)
if err != nil {
- if errors.IsUserNotExist(err) {
+ if db.IsErrUserNotExist(err) {
c.Flash.Error(c.Tr("form.user_not_exist"))
c.Redirect(c.Org.OrgLink + "/teams/" + c.Org.Team.LowerName)
} else {
- c.Handle(500, " GetUserByName", err)
+ c.Error(err, "get user by name")
}
return
}
@@ -91,7 +91,7 @@ func TeamsAction(c *context.Context) {
c.Flash.Error(c.Tr("form.last_org_owner"))
} else {
log.Error("Action(%s): %v", c.Params(":action"), err)
- c.JSON(200, map[string]interface{}{
+ c.JSONSuccess(map[string]interface{}{
"ok": false,
"err": err.Error(),
})
@@ -109,7 +109,7 @@ func TeamsAction(c *context.Context) {
func TeamsRepoAction(c *context.Context) {
if !c.Org.IsOwner {
- c.Error(404)
+ c.NotFound()
return
}
@@ -120,12 +120,13 @@ func TeamsRepoAction(c *context.Context) {
var repo *db.Repository
repo, err = db.GetRepositoryByName(c.Org.Organization.ID, repoName)
if err != nil {
- if errors.IsRepoNotExist(err) {
+ if db.IsErrRepoNotExist(err) {
c.Flash.Error(c.Tr("org.teams.add_nonexistent_repo"))
c.Redirect(c.Org.OrgLink + "/teams/" + c.Org.Team.LowerName + "/repositories")
return
}
- c.Handle(500, "GetRepositoryByName", err)
+
+ c.Error(err, "get repository by name")
return
}
err = c.Org.Team.AddRepository(repo)
@@ -134,8 +135,7 @@ func TeamsRepoAction(c *context.Context) {
}
if err != nil {
- log.Error("Action(%s): '%s' %v", c.Params(":action"), c.Org.Team.Name, err)
- c.Handle(500, "TeamsRepoAction", err)
+ c.Errorf(err, "action %q", c.Params(":action"))
return
}
c.Redirect(c.Org.OrgLink + "/teams/" + c.Org.Team.LowerName + "/repositories")
@@ -146,7 +146,7 @@ func NewTeam(c *context.Context) {
c.Data["PageIsOrgTeams"] = true
c.Data["PageIsOrgTeamsNew"] = true
c.Data["Team"] = &db.Team{}
- c.HTML(200, TEAM_NEW)
+ c.Success(TEAM_NEW)
}
func NewTeamPost(c *context.Context, f form.CreateTeam) {
@@ -163,7 +163,7 @@ func NewTeamPost(c *context.Context, f form.CreateTeam) {
c.Data["Team"] = t
if c.HasError() {
- c.HTML(200, TEAM_NEW)
+ c.Success(TEAM_NEW)
return
}
@@ -175,7 +175,7 @@ func NewTeamPost(c *context.Context, f form.CreateTeam) {
case db.IsErrNameReserved(err):
c.RenderWithErr(c.Tr("org.form.team_name_reserved", err.(db.ErrNameReserved).Name), TEAM_NEW, &f)
default:
- c.Handle(500, "NewTeam", err)
+ c.Error(err, "new team")
}
return
}
@@ -187,20 +187,20 @@ func TeamMembers(c *context.Context) {
c.Data["Title"] = c.Org.Team.Name
c.Data["PageIsOrgTeams"] = true
if err := c.Org.Team.GetMembers(); err != nil {
- c.Handle(500, "GetMembers", err)
+ c.Error(err, "get members")
return
}
- c.HTML(200, TEAM_MEMBERS)
+ c.Success(TEAM_MEMBERS)
}
func TeamRepositories(c *context.Context) {
c.Data["Title"] = c.Org.Team.Name
c.Data["PageIsOrgTeams"] = true
if err := c.Org.Team.GetRepositories(); err != nil {
- c.Handle(500, "GetRepositories", err)
+ c.Error(err, "get repositories")
return
}
- c.HTML(200, TEAM_REPOSITORIES)
+ c.Success(TEAM_REPOSITORIES)
}
func EditTeam(c *context.Context) {
@@ -208,7 +208,7 @@ func EditTeam(c *context.Context) {
c.Data["PageIsOrgTeams"] = true
c.Data["team_name"] = c.Org.Team.Name
c.Data["desc"] = c.Org.Team.Description
- c.HTML(200, TEAM_NEW)
+ c.Success(TEAM_NEW)
}
func EditTeamPost(c *context.Context, f form.CreateTeam) {
@@ -218,7 +218,7 @@ func EditTeamPost(c *context.Context, f form.CreateTeam) {
c.Data["Team"] = t
if c.HasError() {
- c.HTML(200, TEAM_NEW)
+ c.Success(TEAM_NEW)
return
}
@@ -234,7 +234,7 @@ func EditTeamPost(c *context.Context, f form.CreateTeam) {
case "admin":
auth = db.ACCESS_MODE_ADMIN
default:
- c.Error(401)
+ c.Status(http.StatusUnauthorized)
return
}
@@ -251,7 +251,7 @@ func EditTeamPost(c *context.Context, f form.CreateTeam) {
case db.IsErrTeamAlreadyExist(err):
c.RenderWithErr(c.Tr("form.team_name_been_taken"), TEAM_NEW, &f)
default:
- c.Handle(500, "UpdateTeam", err)
+ c.Error(err, "update team")
}
return
}
@@ -265,7 +265,7 @@ func DeleteTeam(c *context.Context) {
c.Flash.Success(c.Tr("org.teams.delete_team_success"))
}
- c.JSON(200, map[string]interface{}{
+ c.JSONSuccess(map[string]interface{}{
"redirect": c.Org.OrgLink + "/teams",
})
}
Powered by cgit, Themed by Ted Yin.