Fix newsletters and Decidim Votings (#9188)

* Use the participatory space registry instead of directly constantizing * Fix errors with votings when sending a newsletter Co-authored-by: Andrés Pereira de Lucena <andreslucena@gmail.com>
decidim · May 6, 2022 · a58f371 · a58f371
1 parent 9fa85fe
commit a58f371
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/decidim-admin/app/helpers/decidim/admin/newsletters_helper.rb b/decidim-admin/app/helpers/decidim/admin/newsletters_helper.rb
@@ -102,7 +102,7 @@ def organization_participatory_space(manifest_name)
                                                               .find_participatory_space_manifest(manifest_name)
                                                               .participatory_spaces.call(current_organization)
                                                               .published
-                                                              .sort_by { |space| [space.closed? ? 1 : 0, space.title[current_locale]] }
+                                                              .sort_by { |space| [space.try(:closed?) ? 1 : 0, space.title[current_locale]] }
       end
 
       def spaces_user_can_admin

diff --git a/decidim-admin/app/queries/decidim/admin/newsletter_recipients.rb b/decidim-admin/app/queries/decidim/admin/newsletter_recipients.rb
@@ -51,11 +51,12 @@ def spaces
         @spaces ||= @form.participatory_space_types.map do |type|
           next if type.ids.blank?
 
-          object_class = "Decidim::#{type.manifest_name.classify}"
+          object_class = Decidim.participatory_space_registry.find(type.manifest_name).model_class_name.constantize
+
           if type.ids.include?("all")
-            object_class.constantize.where(organization: @organization)
+            object_class.where(organization: @organization)
           else
-            object_class.constantize.where(id: type.ids.reject(&:blank?))
+            object_class.where(id: type.ids.reject(&:blank?))
           end
         end.flatten.compact
       end

diff --git a/decidim-admin/spec/queries/newsletter_recipients_spec.rb b/decidim-admin/spec/queries/newsletter_recipients_spec.rb
@@ -110,7 +110,10 @@ module Decidim::Admin
               "ids" => [] },
             { "id" => nil,
               "manifest_name" => "initiatives",
-              "ids" => [] }
+              "ids" => [] },
+            { "id" => nil,
+              "manifest_name" => "votings",
+              "ids" => [component.participatory_space.id.to_s] }
           ]
         end
 

diff --git a/decidim-elections/config/locales/en.yml b/decidim-elections/config/locales/en.yml
@@ -59,6 +59,9 @@ en:
       decidim/elections/question:
         one: Question
         other: Questions
+      decidim/voting:
+        one: Voting
+        other: Votings
       decidim/votings/census/dataset:
         one: Dataset
         other: Datasets