Skip to content

Commit d532323

Browse files
authored
Merge pull request #761 from doerfli/bugfix/search-paging
fix: update search pagination to conditionally render full index view…
2 parents f571470 + 853283d commit d532323

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

app/controllers/recipes_controller.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ def search
3434
@recipes = @recipes.page params[:page]
3535

3636
respond_to do |format|
37-
format.html { render partial: 'list' }
37+
if params[:full].nil?
38+
format.html { render partial: 'list' }
39+
else
40+
format.html { render 'index' }
41+
end
3842
end
3943
end
4044

app/views/recipes/_list.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
<% } %>
1313
</ul>
1414

15-
<%= paginate @recipes, window: 2 %>
15+
<%= paginate @recipes, window: 2, params: { full: true } %>

app/views/recipes/index.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div data-controller="search" data-search-url="<%= search_recipes_path %>">
22
<p class="input_has_icons_left">
3-
<%= text_field_tag :search, nil, class: '', placeholder: t('action.search'), autocomplete: 'off',
3+
<%= text_field_tag :search, params[:term], class: '', placeholder: t('action.search'), autocomplete: 'off',
44
'data-action': 'keyup->search#search',
55
'data-search-target': 'term' %>
66
<i class="fas fa-search"></i>

0 commit comments

Comments
 (0)