Fix participatory space resourceable decorator for v0.28 (#69)

* Prepend ParticipatorySpaceResourceableDecorator instead of overriding

* Update changelog and version

CHANGELOG.md

@@ -3,6 +3,9 @@ Following Semantic Versioning 2.
 
 ## next version:
 
+## Version 0.8.1 (MINOR)
+- Fix: Use prepend instead of overriding to apply Lib::Decidim::ParticipatorySpaceResourceableDecorator.
+
 ## Version 0.8.0 (MINOR)
 - Upgrade Decidim to v0.28
 - Upgrade Ruby to 3.1.1

Gemfile.lock

@@ -150,7 +150,7 @@ GIT
 PATH
   remote: .
   specs:
-    decidim-department_admin (0.8.0)
+    decidim-department_admin (0.8.1)
       decidim-admin (~> 0.28.0)
       decidim-core (~> 0.28.0)
 

app/decorators/lib/decidim/participatory_space_resourceable_decorator.rb

@@ -2,32 +2,35 @@
 
 module Lib::Decidim::ParticipatorySpaceResourceableDecorator
   #
-  # This decorator overrided method to avoid .to_sym error when logged in user is Department Admin
-  # Override affects only line `case role_name&.to_sym`
-  # Furthermore added new ParticipatorySpaceRole case for DeparmentAdmin
+  # - Add new ParticipatorySpaceRole case for DeparmentAdmin.
+  # - Add .to_sym to the `case` test, to avoid error when logged in user is Department Admin
+  # This override affects only line `case role_name&.to_sym`
   #
-  def self.decorate
-    Decidim::ParticipatorySpaceResourceable.class_eval do
-      def user_role_config_for(user, role_name)
-        case role_name&.to_sym
-        when :organization_admin
-          Decidim::ParticipatorySpaceRoleConfig::Admin.new(user)
-        when :admin # ParticipatorySpace admin
-          Decidim::ParticipatorySpaceRoleConfig::ParticipatorySpaceAdmin.new(user)
-        when :department_admin
-          Decidim::ParticipatorySpaceRoleConfig::DepartmentAdmin.new(user)
-        when :valuator
-          Decidim::ParticipatorySpaceRoleConfig::Valuator.new(user)
-        when :moderator
-          Decidim::ParticipatorySpaceRoleConfig::Moderator.new(user)
-        when :collaborator
-          Decidim::ParticipatorySpaceRoleConfig::Collaborator.new(user)
-        else
-          Decidim::ParticipatorySpaceRoleConfig::NullObject.new(user)
-        end
-      end
+  def user_role_config_for(user, role_name)
+    case role_name&.to_sym
+    when :organization_admin
+      Decidim::ParticipatorySpaceRoleConfig::Admin.new(user)
+    when :admin # ParticipatorySpace admin
+      Decidim::ParticipatorySpaceRoleConfig::ParticipatorySpaceAdmin.new(user)
+    when :department_admin
+      Decidim::ParticipatorySpaceRoleConfig::DepartmentAdmin.new(user)
+    when :valuator
+      Decidim::ParticipatorySpaceRoleConfig::Valuator.new(user)
+    when :moderator
+      Decidim::ParticipatorySpaceRoleConfig::Moderator.new(user)
+    when :collaborator
+      Decidim::ParticipatorySpaceRoleConfig::Collaborator.new(user)
+    else
+      Decidim::ParticipatorySpaceRoleConfig::NullObject.new(user)
     end
   end
 end
 
-Lib::Decidim::ParticipatorySpaceResourceableDecorator.decorate
+require "decidim/assembly"
+Decidim::Assembly.prepend(Lib::Decidim::ParticipatorySpaceResourceableDecorator)
+require "decidim/participatory_process"
+Decidim::ParticipatoryProcess.prepend(Lib::Decidim::ParticipatorySpaceResourceableDecorator)
+if Decidim::DepartmentAdmin.conferences_defined?
+  require "decidim/conference"
+  Decidim::Conference.prepend(Lib::Decidim::ParticipatorySpaceResourceableDecorator)
+end

lib/decidim/department_admin/engine.rb

@@ -47,6 +47,7 @@ class Engine < ::Rails::Engine
         # force the concern to be included so that registry is initialized
         # we choose some random class already including it
         require "decidim/participatory_processes/admin/categories_controller"
+        require "decidim/participatory_processes/admin/components_controller"
         artifact = ::Decidim::ParticipatoryProcesses::Admin::Concerns::ParticipatoryProcessAdmin
         ParticipatoryProcessesAdminConcernPermissions = Class.new(::Decidim::DepartmentAdmin::Permissions)
         register_new_permissions_for(artifact, ParticipatoryProcessesAdminConcernPermissions)

lib/decidim/department_admin/version.rb

@@ -5,7 +5,7 @@ module Decidim
   module DepartmentAdmin
     # see CHANGELOG.md
     def self.version
-      "0.8.0"
+      "0.8.1"
     end
   end
 end