diff options
author | Lunny Xiao <xiaolunwen@gmail.com> | 2018-03-16 22:04:33 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-16 22:04:33 +0800 |
commit | 9e5d0a09eb7370daedb1cf572d25ffa150eacf17 (patch) | |
tree | f39cbf6a572bda0e82caec7ef1697ceb70e37f1e /modules/search | |
parent | 4163cdf3ea6d6ca43b694de0c15cc93659d6c2b3 (diff) | |
download | gitea-9e5d0a09eb7370daedb1cf572d25ffa150eacf17.tar.gz gitea-9e5d0a09eb7370daedb1cf572d25ffa150eacf17.zip |
Global code search support (#3664)
* add global code search on explore
* fix bug when no anyone public repos
* change the icon
* fix typo and add UnitTypeCode check for login non-admin user
* fix ui description when no match
Diffstat (limited to 'modules/search')
-rw-r--r-- | modules/search/search.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/search/search.go b/modules/search/search.go index db0c0a6168..9b93fe58fb 100644 --- a/modules/search/search.go +++ b/modules/search/search.go @@ -17,6 +17,7 @@ import ( // Result a search result to display type Result struct { + RepoID int64 Filename string HighlightClass string LineNumbers []int @@ -98,6 +99,7 @@ func searchResult(result *indexer.RepoSearchResult, startIndex, endIndex int) (* index += len(line) } return &Result{ + RepoID: result.RepoID, Filename: result.Filename, HighlightClass: highlight.FileNameToHighlightClass(result.Filename), LineNumbers: lineNumbers, @@ -106,12 +108,12 @@ func searchResult(result *indexer.RepoSearchResult, startIndex, endIndex int) (* } // PerformSearch perform a search on a repository -func PerformSearch(repoID int64, keyword string, page, pageSize int) (int, []*Result, error) { +func PerformSearch(repoIDs []int64, keyword string, page, pageSize int) (int, []*Result, error) { if len(keyword) == 0 { return 0, nil, nil } - total, results, err := indexer.SearchRepoByKeyword(repoID, keyword, page, pageSize) + total, results, err := indexer.SearchRepoByKeyword(repoIDs, keyword, page, pageSize) if err != nil { return 0, nil, err } |