Updating to persist a params snippets variable

5 files changed, 38 insertions, 37 deletions

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index dab38858bf9..58ec8e75d7a 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -5,6 +5,7 @@ class SearchController < ApplicationController
     @project = Project.find_by(id: params[:project_id]) if params[:project_id].present?
     @group = Group.find_by(id: params[:group_id]) if params[:group_id].present?
     @scope = params[:scope]
+    @show_snippets = params[:snippets].eql? 'true'
 
     @search_results = if @project
                         return access_denied! unless can?(current_user, :download_code, @project)
@@ -14,7 +15,7 @@ class SearchController < ApplicationController
                         end
 
                         Search::ProjectService.new(@project, current_user, params).execute
-                      elsif params[:snippets].eql? 'true'
+                      elsif @show_snippets
                         unless %w(snippet_blobs snippet_titles).include?(@scope)
                           @scope = 'snippet_blobs'
                         end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index db2d7214077..c2c9301cc17 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -178,7 +178,7 @@ module ApplicationHelper
   def search_placeholder
     if @project && @project.persisted?
       "Search in this project"
-    elsif @snippet || @snippets || (params && params[:snippets] == 'true')
+    elsif @snippet || @snippets || @show_snippets
       'Search snippets'
     elsif @group && @group.persisted?
       "Search in this group"
diff --git a/app/views/search/_filter.html.haml b/app/views/search/_filter.html.haml
index 2f71541a472..049aff0bc9b 100644
--- a/app/views/search/_filter.html.haml
+++ b/app/views/search/_filter.html.haml
@@ -1,36 +1,35 @@
-- unless params[:snippets]
-  .dropdown.inline
-    %a.dropdown-toggle.btn.btn-small{href: '#', "data-toggle" => "dropdown"}
-      %i.icon-tags
-      %span.light Group:
-      - if @group.present?
-        %strong= @group.name
-      - else
+.dropdown.inline
+  %a.dropdown-toggle.btn.btn-small{href: '#', "data-toggle" => "dropdown"}
+    %i.icon-tags
+    %span.light Group:
+    - if @group.present?
+      %strong= @group.name
+    - else
+      Any
+    %b.caret
+  %ul.dropdown-menu
+    %li
+      = link_to search_filter_path(group_id: nil) do
         Any
-      %b.caret
-    %ul.dropdown-menu
+    - current_user.authorized_groups.sort_by(&:name).each do |group|
       %li
-        = link_to search_filter_path(group_id: nil) do
-          Any
-      - current_user.authorized_groups.sort_by(&:name).each do |group|
-        %li
-          = link_to search_filter_path(group_id: group.id, project_id: nil) do
-            = group.name
+        = link_to search_filter_path(group_id: group.id, project_id: nil) do
+          = group.name
 
-  .dropdown.inline.prepend-left-10.project-filter
-    %a.dropdown-toggle.btn.btn-small{href: '#', "data-toggle" => "dropdown"}
-      %i.icon-tags
-      %span.light Project:
-      - if @project.present?
-        %strong= @project.name_with_namespace
-      - else
+.dropdown.inline.prepend-left-10.project-filter
+  %a.dropdown-toggle.btn.btn-small{href: '#', "data-toggle" => "dropdown"}
+    %i.icon-tags
+    %span.light Project:
+    - if @project.present?
+      %strong= @project.name_with_namespace
+    - else
+      Any
+    %b.caret
+  %ul.dropdown-menu
+    %li
+      = link_to search_filter_path(project_id: nil) do
         Any
-      %b.caret
-    %ul.dropdown-menu
+    - current_user.authorized_projects.sort_by(&:name_with_namespace).each do |project|
       %li
-        = link_to search_filter_path(project_id: nil) do
-          Any
-      - current_user.authorized_projects.sort_by(&:name_with_namespace).each do |project|
-        %li
-          = link_to search_filter_path(project_id: project.id, group_id: nil) do
-            = project.name_with_namespace
+        = link_to search_filter_path(project_id: project.id, group_id: nil) do
+          = project.name_with_namespace
diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml
index 83fd5ca10e5..58bcff9dbe3 100644
--- a/app/views/search/_results.html.haml
+++ b/app/views/search/_results.html.haml
@@ -1,6 +1,6 @@
 %h4
   #{@search_results.total_count} results found
-  - unless params[:snippets].eql? 'true'
+  - unless @show_snippets
     - if @project
       for #{link_to @project.name_with_namespace, @project}
     - elsif @group
@@ -12,7 +12,7 @@
   .col-sm-3
     - if @project
       = render "project_filter"
-    - elsif params[:snippets].eql? 'true'
+    - elsif @show_snippets
       = render 'snippet_filter'
     - else
       = render "global_filter"
diff --git a/app/views/search/show.html.haml b/app/views/search/show.html.haml
index 9deec490953..bae57917a4c 100644
--- a/app/views/search/show.html.haml
+++ b/app/views/search/show.html.haml
@@ -9,8 +9,9 @@
         = submit_tag 'Search', class: "btn btn-create"
     .form-group
       .col-sm-2
-      .col-sm-10
-        = render 'filter', f: f
+      - unless params[:snippets].eql? 'true'
+        .col-sm-10
+          = render 'filter', f: f
       = hidden_field_tag :project_id, params[:project_id]
       = hidden_field_tag :group_id, params[:group_id]
       = hidden_field_tag :snippets, params[:snippets]