Simplify accessing advanced search params
This commit is contained in:
@@ -35,7 +35,7 @@
|
|||||||
<%= t("shared.advanced_search.from") %> (<%= t("shared.advanced_search.date_placeholder") %>)
|
<%= t("shared.advanced_search.from") %> (<%= t("shared.advanced_search.date_placeholder") %>)
|
||||||
</label>
|
</label>
|
||||||
<%= text_field_tag "advanced_search[date_min]",
|
<%= text_field_tag "advanced_search[date_min]",
|
||||||
params[:advanced_search].try(:[], :date_min),
|
advanced_search[:date_min],
|
||||||
class: "js-calendar" %>
|
class: "js-calendar" %>
|
||||||
</div>
|
</div>
|
||||||
<div class="small-12 large-6 column">
|
<div class="small-12 large-6 column">
|
||||||
@@ -43,7 +43,7 @@
|
|||||||
<%= t("shared.advanced_search.to") %> (<%= t("shared.advanced_search.date_placeholder") %>)
|
<%= t("shared.advanced_search.to") %> (<%= t("shared.advanced_search.date_placeholder") %>)
|
||||||
</label>
|
</label>
|
||||||
<%= text_field_tag "advanced_search[date_max]",
|
<%= text_field_tag "advanced_search[date_max]",
|
||||||
params[:advanced_search].try(:[], :date_max),
|
advanced_search[:date_max],
|
||||||
class: "js-calendar" %>
|
class: "js-calendar" %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -3,12 +3,12 @@ class Shared::AdvancedSearchComponent < ApplicationComponent
|
|||||||
private
|
private
|
||||||
|
|
||||||
def advanced_search
|
def advanced_search
|
||||||
params[:advanced_search]
|
params[:advanced_search] || {}
|
||||||
end
|
end
|
||||||
|
|
||||||
def official_level_search_options
|
def official_level_search_options
|
||||||
options_for_select((1..5).map { |i| [setting["official_level_#{i}_name"], i] },
|
options_for_select((1..5).map { |i| [setting["official_level_#{i}_name"], i] },
|
||||||
params[:advanced_search].try(:[], :official_level))
|
advanced_search[:official_level])
|
||||||
end
|
end
|
||||||
|
|
||||||
def date_range_options
|
def date_range_options
|
||||||
@@ -22,10 +22,10 @@ class Shared::AdvancedSearchComponent < ApplicationComponent
|
|||||||
end
|
end
|
||||||
|
|
||||||
def selected_date_range
|
def selected_date_range
|
||||||
custom_date_range? ? "custom" : params[:advanced_search].try(:[], :date_min)
|
custom_date_range? ? "custom" : advanced_search[:date_min]
|
||||||
end
|
end
|
||||||
|
|
||||||
def custom_date_range?
|
def custom_date_range?
|
||||||
params[:advanced_search].try(:[], :date_max).present?
|
advanced_search[:date_max].present?
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user