aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/calendars_controller.rb
diff options
context:
space:
mode:
authorXinhui2017-05-04 15:22:57 +0200
committerXinhui2017-05-04 15:23:04 +0200
commitb54ab0a2321bbd0c5c6162a0d313800bb586a98d (patch)
tree7ff40b3eb27699caf0a49c2483df8a9cb5dd9c28 /app/controllers/calendars_controller.rb
parentce845b8053d4fc665ca700c064cbd6f276bc4e1d (diff)
downloadchouette-core-b54ab0a2321bbd0c5c6162a0d313800bb586a98d.tar.bz2
Fix can't edit or create calendar due to 3 parts date_select
Refs #3298
Diffstat (limited to 'app/controllers/calendars_controller.rb')
-rw-r--r--app/controllers/calendars_controller.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index d18e165d2..5370d9cbb 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -45,14 +45,13 @@ class CalendarsController < BreadcrumbController
end
def ransack_contains_date
- # 3 parts to date object, in order to use in ransackable_scopes
+ date =[]
if params[:q] && !params[:q]['contains_date(1i)'].empty?
- date =[]
['contains_date(1i)', 'contains_date(2i)', 'contains_date(3i)'].each do |key|
- date << params[:q][key]
+ date << params[:q][key].to_i
params[:q].delete(key)
end
- params[:q]['contains_date'] = Date.parse(date.join('-'))
+ params[:q]['contains_date'] = Date.new(*date)
end
end