peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make fmt

Browse Source
This commit is contained in:
Matti Ranta 2018-07-13 21:23:12 -04:00
parent 250f85816f
commit a60f4be736
No known key found for this signature in database
GPG Key ID: D9B5613BEB813F99
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
models/org_test.go
View File

@ -552,7 +552,7 @@ func TestHasOrgVisibleTypePublic(t *testing.T) {
const newOrgName = "test-org-public" const newOrgName = "test-org-public"
org := &User{ org := &User{
Name: newOrgName, Name: newOrgName,
Visibility: VisibleTypePublic, Visibility: VisibleTypePublic,
} }
@ -575,7 +575,7 @@ func TestHasOrgVisibleTypeLimited(t *testing.T) {
const newOrgName = "test-org-limited" const newOrgName = "test-org-limited"
org := &User{ org := &User{
Name: newOrgName, Name: newOrgName,
Visibility: VisibleTypeLimited, Visibility: VisibleTypeLimited,
} }
@ -586,8 +586,8 @@ func TestHasOrgVisibleTypeLimited(t *testing.T) {
test1 := HasOrgVisible([]*User{org}, owner) test1 := HasOrgVisible([]*User{org}, owner)
test2 := HasOrgVisible([]*User{org}, user3) test2 := HasOrgVisible([]*User{org}, user3)
test3 := HasOrgVisible([]*User{org}, nil) test3 := HasOrgVisible([]*User{org}, nil)
assert.Equal(t, test1, true) // owner of org assert.Equal(t, test1, true) // owner of org
assert.Equal(t, test2, true) // user not a part of org assert.Equal(t, test2, true) // user not a part of org
assert.Equal(t, test3, false) // logged out user assert.Equal(t, test3, false) // logged out user
} }
@ -598,7 +598,7 @@ func TestHasOrgVisibleTypePrivate(t *testing.T) {
const newOrgName = "test-org-private" const newOrgName = "test-org-private"
org := &User{ org := &User{
Name: newOrgName, Name: newOrgName,
Visibility: VisibleTypePrivate, Visibility: VisibleTypePrivate,
} }
@ -609,7 +609,7 @@ func TestHasOrgVisibleTypePrivate(t *testing.T) {
test1 := HasOrgVisible([]*User{org}, owner) test1 := HasOrgVisible([]*User{org}, owner)
test2 := HasOrgVisible([]*User{org}, user3) test2 := HasOrgVisible([]*User{org}, user3)
test3 := HasOrgVisible([]*User{org}, nil) test3 := HasOrgVisible([]*User{org}, nil)
assert.Equal(t, test1, true) // owner of org assert.Equal(t, test1, true) // owner of org
assert.Equal(t, test2, false) // user not a part of org assert.Equal(t, test2, false) // user not a part of org
assert.Equal(t, test3, false) // logged out user assert.Equal(t, test3, false) // logged out user
} }

3
routers/api/v1/org/org.go
View File

@ -1,4 +1,5 @@
// Copyright 2015 The Gogs Authors. All rights reserved. // Copyright 2015 The Gogs Authors. All rights reserved.
// Copyright 2018 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style // Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
@ -78,7 +79,7 @@ func Get(ctx *context.APIContext) {
// responses: // responses:
// "200": // "200":
// "$ref": "#/responses/Organization" // "$ref": "#/responses/Organization"
canSeeOrg := models.HasOrgVisible([]*models.User{ctx.Org}, ctx.User) canSeeOrg := models.HasOrgVisible([]*models.User{ctx.Org.Organization}, ctx.User)
if !canSeeOrg { if !canSeeOrg {
ctx.NotFound("HasOrgVisible", nil) ctx.NotFound("HasOrgVisible", nil)
return return