Merge pull request #420 from puzzle/feature/418

Revert participatory process grouping
puzzle · Mar 27, 2024 · b307084 · b307084
2 parents 37b5d5b + bec5f59
commit b307084
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 118 deletions.
diff --git a/app/cells/decidim/participatory_processes/process_filters/filter_tabs.erb b/app/cells/decidim/participatory_processes/process_filters/filter_tabs.erb
diff --git a/app/cells/decidim_zuerich/participatory_processes/process_filters_cell.rb b/app/cells/decidim_zuerich/participatory_processes/process_filters_cell.rb
diff --git a/app/overrides/cells/decidim/participatory_processes/process_filters_cell_override.rb b/app/overrides/cells/decidim/participatory_processes/process_filters_cell_override.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# We would love to do a prepend instead of what is happening here
+# For whatever reason though the prepend never properly works
+# Even if we include the module it doesn't get loaded
+# Must be some crazy loading shenanigans
+# Pry-ing into the customization class and using the following commands might be useful for future debugging:
+# $ -a Decidim::ParticipatoryProcesses::ProcessFiltersCell
+# $ -a DecidimZuerich::ParticipatoryProcesses::ProcessFiltersCell
+Decidim::ParticipatoryProcesses::ProcessFiltersCell.class_eval do
+  def other_filters_with_value
+    @other_filters_with_value ||= [current_filter] + other_filters.select do |filter|
+      process_count_by_filter[filter].positive?
+    end
+  end
+end
diff --git a/...ontrollers/decidim/participatory_processes/participatory_processes_controller_override.rb b/...ontrollers/decidim/participatory_processes/participatory_processes_controller_override.rb
diff --git a/...y_processes/participatory_processes/index/display_process_groups_override.html.erb.deface b/...y_processes/participatory_processes/index/display_process_groups_override.html.erb.deface
diff --git a/app/views/decidim/participatory_processes/participatory_processes/_process_groups.html.erb b/app/views/decidim/participatory_processes/participatory_processes/_process_groups.html.erb
diff --git a/app/views/decidim/participatory_processes/participatory_processes/index.js.erb b/app/views/decidim/participatory_processes/participatory_processes/index.js.erb
diff --git a/config/initializers/decidim_zuerich_customization.rb b/config/initializers/decidim_zuerich_customization.rb
@@ -23,7 +23,6 @@
   [Decidim::ParticipatoryProcesses::Permissions,                DecidimZuerich::ParticipatoryProcesses::Permissions],
   [Decidim::Proposals::DiffRenderer,                            DecidimZuerich::Proposals::DiffRenderer],
   [Decidim::Proposals::MapHelper,                               DecidimZuerich::Proposals::MapHelper],
-  [Decidim::ParticipatoryProcesses::ProcessFiltersCell,         DecidimZuerich::ParticipatoryProcesses::ProcessFiltersCell],
   [Decidim::ResourceLocatorPresenter,                           DecidimZuerich::ResourceLocatorPresenter],
   [Decidim::ParticipatoryProcesses::ParticipatoryProcessHelper, DecidimZuerich::ParticipatoryProcesses::ParticipatoryProcessHelper],
   [Decidim::System::RegisterOrganization,                       DecidimZuerich::System::RegisterOrganization],