consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify accessing advanced search params

Browse Source
This commit is contained in:
Javi Martín
2020-12-28 14:29:36 +01:00
parent 2faf99c54b
commit f024a643ea
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/components/shared/advanced_search_component.html.erb
View File

@@ -35,7 +35,7 @@
<%= t("shared.advanced_search.from") %> (<%= t("shared.advanced_search.date_placeholder") %>)
</label>
<%= text_field_tag "advanced_search[date_min]",
params[:advanced_search].try(:[], :date_min),
advanced_search[:date_min],
class: "js-calendar" %>
</div>
<div class="small-12 large-6 column">
@@ -43,7 +43,7 @@
<%= t("shared.advanced_search.to") %> (<%= t("shared.advanced_search.date_placeholder") %>)
</label>
<%= text_field_tag "advanced_search[date_max]",
params[:advanced_search].try(:[], :date_max),
advanced_search[:date_max],
class: "js-calendar" %>
</div>
</div>

8
app/components/shared/advanced_search_component.rb
View File

@@ -3,12 +3,12 @@ class Shared::AdvancedSearchComponent < ApplicationComponent
private
def advanced_search
params[:advanced_search]
params[:advanced_search] || {}
end
def official_level_search_options
options_for_select((1..5).map { |i| [setting["official_level_#{i}_name"], i] },
params[:advanced_search].try(:[], :official_level))
advanced_search[:official_level])
end
def date_range_options
@@ -22,10 +22,10 @@ class Shared::AdvancedSearchComponent < ApplicationComponent
end
def selected_date_range
custom_date_range? ? "custom" : params[:advanced_search].try(:[], :date_min)
custom_date_range? ? "custom" : advanced_search[:date_min]
end
def custom_date_range?
params[:advanced_search].try(:[], :date_max).present?
advanced_search[:date_max].present?
end
end