Refs #2265 Refs #2262 : Calendars search and CRUD

1 files changed, 1 insertions, 5 deletions

diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index 697d8a507..579a48e1d 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -7,7 +7,7 @@ class CalendarsController < BreadcrumbController
 
   private
   def calendar_params
-    params.require(:calendar).permit(:id, :name, :short_name, :shared, periods_attributes: [:id, :begin, :end, :_destroy], dates: [])
+    params.require(:calendar).permit(:id, :name, :short_name, :shared, periods_attributes: [:id, :begin, :end, :_destroy], date_values_attributes: [:id, :value, :_destroy])
   end
 
   def sort_column
@@ -31,10 +31,6 @@ class CalendarsController < BreadcrumbController
 
   def collection
     return @calendars if @calendars
-    if params[:q]
-      params[:q].delete(:shared_eq) if params[:q][:shared_eq] == ''
-      params[:q].delete(:short_name_cont) if params[:q][:short_name_cont] == ''
-    end
 
     @q = current_organisation.calendars.search(params[:q])
     calendars = @q.result