Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 05:25:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #1355)Fix RepositoryService#getVisibleRepositories() condition

Browse Source
This commit is contained in:
Naoki Takezoe
2016-11-27 16:42:28 +09:00
parent cccff46715
commit 25c4b1e6a7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/gitbucket/core/service/RepositoryService.scala
View File

@@ -278,7 +278,9 @@ trait RepositoryService { self: AccountService =>
case Some(x) if(x.isAdmin) => Repositories case Some(x) if(x.isAdmin) => Repositories
// for Normal Users // for Normal Users
case Some(x) if(!x.isAdmin) => case Some(x) if(!x.isAdmin) =>
Repositories filter { t => (t.isPrivate === false.bind) || (t.userName === x.userName) || Repositories filter { t =>
(t.isPrivate === false.bind) || (t.userName === x.userName) ||
(t.userName in GroupMembers.filter(_.userName === x.userName.bind).map(_.groupName)) ||
(Collaborators.filter { t2 => (Collaborators.filter { t2 =>
t2.byRepository(t.userName, t.repositoryName) && t2.byRepository(t.userName, t.repositoryName) &&
(t2.collaboratorName === x.userName.bind) || (t2.collaboratorName in GroupMembers.filter(_.userName === x.userName.bind).map(_.groupName)) (t2.collaboratorName === x.userName.bind) || (t2.collaboratorName in GroupMembers.filter(_.userName === x.userName.bind).map(_.groupName))