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

uses case statement instead of eval

Browse Source
This commit is contained in:
rgarcia
2016-01-18 15:02:18 +01:00
parent f135bae082
commit 8d7984dcb3
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/controllers/concerns/commentable_actions.rb
View File

@@ -98,8 +98,22 @@ module CommentableActions
end
def search_start_date
date = Date.parse(params[:advanced_search][:date_min]) rescue nil
date || eval(params[:advanced_search][:date_min]).to_date
case params[:advanced_search][:date_min]
when '1'
24.hours.ago
when '2'
1.week.ago
when '3'
1.month.ago
when '4'
1.year.ago
else
Date.parse(params[:advanced_search][:date_min]) rescue nil
end
end
def method_name
end
def search_finish_date

8
app/helpers/search_helper.rb
View File

@@ -12,10 +12,10 @@ module SearchHelper
def date_range_options
options_for_select([
[t("shared.advanced_search.date_1"), "24.hours.ago"],
[t("shared.advanced_search.date_2"), "1.week.ago"],
[t("shared.advanced_search.date_3"), "30.days.ago"],
[t("shared.advanced_search.date_4"), "1.year.ago"],
[t("shared.advanced_search.date_1"), 1],
[t("shared.advanced_search.date_2"), 2],
[t("shared.advanced_search.date_3"), 3],
[t("shared.advanced_search.date_4"), 4],
[t("shared.advanced_search.date_5"), 'custom']],
selected_date_range)
end