USEFULL
/
gogs
mirror of https://github.com/gogs/gogs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

db: fix update team panic (#6253) 

* db: fix update team panic

* Update CHANGELOG
pull/6255/head
ᴜɴᴋɴᴡᴏɴ 2020-08-16 21:31:08 +08:00 committed by GitHub
parent f667d139bc
commit a961afe52b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -56,6 +56,7 @@ All notable changes to Gogs are documented in this file.
- Private repositories are hidden in the organization's view. [#5869](https://github.com/gogs/gogs/issues/5869) - Private repositories are hidden in the organization's view. [#5869](https://github.com/gogs/gogs/issues/5869)
- Server error when changing email address in user settings page. [#5899](https://github.com/gogs/gogs/issues/5899) - Server error when changing email address in user settings page. [#5899](https://github.com/gogs/gogs/issues/5899)
- Fall back to use RFC 3339 as time layout when misconfigured. [#6098](https://github.com/gogs/gogs/issues/6098) - Fall back to use RFC 3339 as time layout when misconfigured. [#6098](https://github.com/gogs/gogs/issues/6098)
- Unable to update team with server error. [#6185](https://github.com/gogs/gogs/issues/6185)
- Webhooks are not fired after push when `[service] REQUIRE_SIGNIN_VIEW = true`. - Webhooks are not fired after push when `[service] REQUIRE_SIGNIN_VIEW = true`.
### Removed ### Removed

2
internal/context/context.go
View File

@ -179,7 +179,7 @@ func (c *Context) NotFound() {
// Error renders the 500 page. // Error renders the 500 page.
func (c *Context) Error(err error, msg string) { func (c *Context) Error(err error, msg string) {
log.ErrorDepth(5, "%s: %v", msg, err) log.ErrorDepth(4, "%s: %v", msg, err)
c.Title("status.internal_server_error") c.Title("status.internal_server_error")

2
internal/db/org_team.go
View File

@ -348,7 +348,7 @@ func UpdateTeam(t *Team, authChanged bool) (err error) {
t.LowerName = strings.ToLower(t.Name) t.LowerName = strings.ToLower(t.Name)
existingTeam := new(Team) existingTeam := new(Team)
has, err := x.Where("org_id=?", t.OrgID).And("lower_name=?", t.LowerName).And("id!=?", t.ID).Get(&existingTeam) has, err := x.Where("org_id=?", t.OrgID).And("lower_name=?", t.LowerName).And("id!=?", t.ID).Get(existingTeam)
if err != nil { if err != nil {
return err return err
} else if has { } else if has {