Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-09-07 16:42:23 +0300
committerSean McGivern <sean@mcgivern.me.uk>2017-09-07 16:42:23 +0300
commitb4778a586665fe522ae3f4f7a567766b696b847d (patch)
tree133d25f06731111382632e8f42b81532b9b19b81 /app/helpers/search_helper.rb
parentcb555da178573ceac01f0b76060572545857364a (diff)
parenta1a839c99f7d9ce69ce0712d93951dba216ecb11 (diff)
Merge branch 'ee_issue_928_backport' into 'master'
Group boards CE backport See merge request !13883
Diffstat (limited to 'app/helpers/search_helper.rb')
-rw-r--r--app/helpers/search_helper.rb14
1 files changed, 8 insertions, 6 deletions
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 98e824a8c65..af6683a548b 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -134,19 +134,21 @@ module SearchHelper
end
def search_filter_input_options(type)
- opts = {
- id: "filtered-search-#{type}",
- placeholder: 'Search or filter results...',
- data: {
- 'username-params' => @users.to_json(only: [:id, :username])
+ opts =
+ {
+ id: "filtered-search-#{type}",
+ placeholder: 'Search or filter results...',
+ data: {
+ 'username-params' => @users.to_json(only: [:id, :username])
+ }
}
- }
if @project.present?
opts[:data]['project-id'] = @project.id
opts[:data]['base-endpoint'] = project_path(@project)
else
# Group context
+ opts[:data]['group-id'] = @group.id
opts[:data]['base-endpoint'] = group_canonical_path(@group)
end