summaryrefslogtreecommitdiffstats
path: root/models
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-07-25 00:49:40 +0800
committerUnknwon <u@gogs.io>2015-07-25 00:49:40 +0800
commit54b58e988d4fac4a3f67feef39d62134352fb07c (patch)
treedb32c6c6860f6b6bacb0c90c32a25b5a3b7c8002 /models
parentdc4aab9925b46f8ad4b18f7926e2904163c1c5b5 (diff)
parent70d44e9565e372c73d4f0f42273d4899e8e07f75 (diff)
downloadgitea-54b58e988d4fac4a3f67feef39d62134352fb07c.tar.gz
gitea-54b58e988d4fac4a3f67feef39d62134352fb07c.zip
Merge branch 'develop' of github.com:gogits/gogs into feature/page_issues
Diffstat (limited to 'models')
-rw-r--r--models/access.go7
1 files changed, 3 insertions, 4 deletions
diff --git a/models/access.go b/models/access.go
index 51b60c9970..54d0f099c6 100644
--- a/models/access.go
+++ b/models/access.go
@@ -173,13 +173,12 @@ func (repo *Repository) refreshCollaboratorAccesses(e Engine, accessMap map[int6
func (repo *Repository) recalculateTeamAccesses(e Engine, ignTeamID int64) (err error) {
accessMap := make(map[int64]AccessMode, 20)
- if err = repo.refreshCollaboratorAccesses(e, accessMap); err != nil {
- return fmt.Errorf("refreshCollaboratorAccesses: %v", err)
- }
-
if err = repo.getOwner(e); err != nil {
return err
}
+ if err = repo.refreshCollaboratorAccesses(e, accessMap); err != nil {
+ return fmt.Errorf("refreshCollaboratorAccesses: %v", err)
+ }
if repo.Owner.IsOrganization() {
if err = repo.Owner.getTeams(e); err != nil {
return err