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

Don't retrieve unused repository information when withoutPhysicalInfo is true

Browse Source
This commit is contained in:
Naoki Takezoe
2017-04-18 18:42:56 +09:00
parent 835f35393e
commit 9c078971ab
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/scala/gitbucket/core/controller/IndexController.scala
View File

@@ -26,13 +26,13 @@ trait IndexControllerBase extends ControllerBase {
"password" -> trim(label("Password", text(required))) "password" -> trim(label("Password", text(required)))
)(SignInForm.apply) )(SignInForm.apply)
val searchForm = mapping( // val searchForm = mapping(
"query" -> trim(text(required)), // "query" -> trim(text(required)),
"owner" -> trim(text(required)), // "owner" -> trim(text(required)),
"repository" -> trim(text(required)) // "repository" -> trim(text(required))
)(SearchForm.apply) // )(SearchForm.apply)
//
case class SearchForm(query: String, owner: String, repository: String) // case class SearchForm(query: String, owner: String, repository: String)
get("/"){ get("/"){
@@ -163,7 +163,7 @@ trait IndexControllerBase extends ControllerBase {
get("/search"){ get("/search"){
val query = params.getOrElse("query", "").trim.toLowerCase val query = params.getOrElse("query", "").trim.toLowerCase
val visibleRepositories = getVisibleRepositories(context.loginAccount, None) val visibleRepositories = getVisibleRepositories(context.loginAccount, repositoryUserName = None, withoutPhysicalInfo = true)
val repositories = visibleRepositories.filter { repository => val repositories = visibleRepositories.filter { repository =>
repository.name.toLowerCase.indexOf(query) >= 0 || repository.owner.toLowerCase.indexOf(query) >= 0 repository.name.toLowerCase.indexOf(query) >= 0 || repository.owner.toLowerCase.indexOf(query) >= 0
} }

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

@@ -262,11 +262,19 @@ trait RepositoryService { self: AccountService =>
JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName) JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName)
}, },
repository, repository,
if(withoutPhysicalInfo){
-1
} else {
getForkedCount( getForkedCount(
repository.originUserName.getOrElse(repository.userName), repository.originUserName.getOrElse(repository.userName),
repository.originRepositoryName.getOrElse(repository.repositoryName) repository.originRepositoryName.getOrElse(repository.repositoryName)
), )
getRepositoryManagers(repository.userName)) },
if(withoutPhysicalInfo){
Nil
} else {
getRepositoryManagers(repository.userName)
})
} }
} }