app/controllers/decidim/debates/debates_controller.rb in decidim-debates-0.26.10 vs app/controllers/decidim/debates/debates_controller.rb in decidim-debates-0.27.0.rc1

@@ -51,11 +51,10 @@
 
       def update
         enforce_permission_to :edit, :debate, debate: debate
 
         @form = form(DebateForm).from_params(params)
-        @form.debate = debate
 
         UpdateDebate.call(@form) do
           on(:ok) do |debate|
             flash[:notice] = I18n.t("debates.update.success", scope: "decidim.debates")
             redirect_to Decidim::ResourceLocatorPresenter.new(debate).path
@@ -70,11 +69,10 @@
 
       def close
         enforce_permission_to :close, :debate, debate: debate
 
         @form = form(CloseDebateForm).from_params(params)
-        @form.debate = debate
 
         CloseDebate.call(@form) do
           on(:ok) do |debate|
             flash[:notice] = I18n.t("debates.close.success", scope: "decidim.debates")
             redirect_back fallback_location: Decidim::ResourceLocatorPresenter.new(debate).path
@@ -96,40 +94,32 @@
       def paginated_debates
         @paginated_debates ||= paginate(debates).includes(:category)
       end
 
       def debates
-        @debates ||= reorder(search.results)
+        @debates ||= reorder(search.result)
       end
 
       def debate
         @debate ||= debates.find_by(id: params[:id])
       end
 
       def close_debate_form
         @close_debate_form ||= form(CloseDebateForm).from_model(debate)
       end
 
-      def search_klass
-        DebateSearch
+      def search_collection
+        Debate.where(component: current_component).not_hidden
       end
 
-      def default_search_params
-        {
-          page: params[:page],
-          per_page: 12
-        }
-      end
-
       def default_filter_params
         {
-          search_text: "",
-          origin: %w(official citizens user_group),
+          search_text_cont: "",
+          with_any_origin: %w(official participants user_group),
           activity: "all",
-          category_id: default_filter_category_params,
-          scope_id: default_filter_scope_params,
-          status: "all",
-          state: %w(open closed)
+          with_any_category: default_filter_category_params,
+          with_any_scope: default_filter_scope_params,
+          with_any_state: %w(open closed)
         }
       end
     end
   end
 end