Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-08 14:35:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

The method of RepositoryService was cleaned up.

Browse Source
This commit is contained in:
takezoe
2013-07-30 03:41:47 +09:00
parent 41a613e151
commit 7d65717784
5 changed files with 49 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/app/AccountController.scala
View File

@@ -58,7 +58,7 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
case _ =>
_root_.account.html.repositories(account,
if(account.isGroupAccount) Nil else getGroupsByUserName(userName),
getVisibleRepositories(userName, baseUrl, context.loginAccount.map(_.userName)))
getVisibleRepositories(context.loginAccount, baseUrl, Some(userName)))
}
} getOrElse NotFound
}

2
src/main/scala/app/DashboardController.scala
View File

@@ -33,7 +33,7 @@ trait DashboardControllerBase extends ControllerBase {
session.put(sessionKey, condition)
val repositories = getAccessibleRepositories(context.loginAccount, baseUrl)
val repositories = getUserRepositories(context.loginAccount.get.userName, baseUrl)
//
dashboard.html.issues(
issues.html.listparts(Nil, 0, 0, 0, condition),

11
src/main/scala/app/IndexController.scala
View File

@@ -16,19 +16,22 @@ trait IndexControllerBase extends ControllerBase {
val loginAccount = context.loginAccount
html.index(getRecentActivities(),
getAccessibleRepositories(loginAccount, baseUrl),
getVisibleRepositories(loginAccount, baseUrl),
loadSystemSettings(),
loginAccount.map{ account => getRepositoryNamesOfUser(account.userName) }.getOrElse(Nil)
loginAccount.map{ account => getUserRepositories(account.userName, baseUrl) }.getOrElse(Nil)
)
}
/**
* JSON API for collaborator completion.
*
* TODO Move to other controller?
*/
// TODO Move to other controller?
get("/_user/proposals")(usersOnly {
contentType = formats("json")
org.json4s.jackson.Serialization.write(Map("options" -> getAllUsers.filter(!_.isGroupAccount).map(_.userName).toArray))
org.json4s.jackson.Serialization.write(
Map("options" -> getAllUsers.filter(!_.isGroupAccount).map(_.userName).toArray)
)
})