diff options
| author | Nick Thomas <nick@gitlab.com> | 2017-08-22 16:10:49 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2017-08-24 11:32:50 +0100 |
| commit | 061472864ceaa4dc837eebcaa583f7b81d4e7e54 (patch) | |
| tree | e760782a7247ca457edafe13de309e67364354ea /app | |
| parent | 502d6464b07154d74eecbeddbf2cd6dba841380f (diff) | |
| download | gitlab-ce-061472864ceaa4dc837eebcaa583f7b81d4e7e54.tar.gz | |
Fix group and project search for anonymous users
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/api.js | 15 | ||||
| -rw-r--r-- | app/views/search/_form.html.haml | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js index 56f91e95bb9..3d0ba65fd36 100644 --- a/app/assets/javascripts/api.js +++ b/app/assets/javascripts/api.js @@ -55,13 +55,18 @@ const Api = { // Return projects list. Filtered by query projects(query, options, callback) { const url = Api.buildUrl(Api.projectsPath); + const defaults = { + search: query, + per_page: 20, + }; + + if (gon.current_user_id) { + defaults.membership = true; + } + return $.ajax({ url, - data: Object.assign({ - search: query, - per_page: 20, - membership: true, - }, options), + data: Object.assign(defaults, options), dataType: 'json', }) .done(projects => callback(projects)); diff --git a/app/views/search/_form.html.haml b/app/views/search/_form.html.haml index 3139be1cd37..a4a5cec1314 100644 --- a/app/views/search/_form.html.haml +++ b/app/views/search/_form.html.haml @@ -11,5 +11,5 @@ %span.sr-only Clear search - unless params[:snippets].eql? 'true' - = render 'filter' if current_user + = render 'filter' = button_tag "Search", class: "btn btn-success btn-search" |