diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-02 21:36:10 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-02 21:36:10 +0000 |
| commit | 300311f395a211bda043e4adbd36c297339af73e (patch) | |
| tree | 28ce1df0ac16b543eb7efa318929a5b7fd18f128 | |
| parent | 1242e0393be30a9f2a42917f4270083e694a2d8f (diff) | |
| parent | 5f15ed04fc58cfe8b7d54b3490248430575b16d9 (diff) | |
| download | gitlab-ce-300311f395a211bda043e4adbd36c297339af73e.tar.gz | |
Merge branch 'improve-search-ux' into 'master'
Improve search ux
When I use search from merge requests page I usually want to see merge requests results. If I do search from wiki pages -> I want to see wiki results first.
With this patch search scope is set to issues if you are on issues controller and same for merge requests and wikis
See merge request !1290
| -rw-r--r-- | app/views/layouts/_search.html.haml | 11 | ||||
| -rw-r--r-- | app/views/search/_project_filter.html.haml | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml index 2460a6a014d..04f79846858 100644 --- a/app/views/layouts/_search.html.haml +++ b/app/views/layouts/_search.html.haml @@ -4,7 +4,16 @@ = hidden_field_tag :group_id, @group.try(:id) - if @project && @project.persisted? = hidden_field_tag :project_id, @project.id - = hidden_field_tag :search_code, true + + - if current_controller?(:issues) + = hidden_field_tag :scope, 'issues' + - elsif current_controller?(:merge_requests) + = hidden_field_tag :scope, 'merge_requests' + - elsif current_controller?(:wikis) + = hidden_field_tag :scope, 'wiki_blobs' + - else + = hidden_field_tag :search_code, true + - if @snippet || @snippets = hidden_field_tag :snippets, true = hidden_field_tag :repository_ref, @ref diff --git a/app/views/search/_project_filter.html.haml b/app/views/search/_project_filter.html.haml index c201b3d6c47..ad933502a28 100644 --- a/app/views/search/_project_filter.html.haml +++ b/app/views/search/_project_filter.html.haml @@ -25,6 +25,7 @@ = @search_results.notes_count %li{class: ("active" if @scope == 'wiki_blobs')} = link_to search_filter_path(scope: 'wiki_blobs') do + %i.fa.fa-book Wiki .pull-right = @search_results.wiki_blobs_count |