Merge branch 'release/0.28-stable' into fix/proposal-steps

openpoke · Apr 23, 2024 · 6c1549f · 6c1549f
2 parents bfcca23 + 353bf20
commit 6c1549f
Show file tree

Hide file tree

Showing 18 changed files with 15 additions and 621 deletions.
diff --git a/app/commands/concerns/decidim/templates/admin/copy_questionnaire_template_override.rb b/app/commands/concerns/decidim/templates/admin/copy_questionnaire_template_override.rb
diff --git a/app/commands/concerns/decidim/templates/admin/create_questionnaire_template_override.rb b/app/commands/concerns/decidim/templates/admin/create_questionnaire_template_override.rb
diff --git a/app/commands/decidim/templates/admin/copy_proposal_answer_template.rb b/app/commands/decidim/templates/admin/copy_proposal_answer_template.rb
diff --git a/app/commands/decidim/templates/admin/create_proposal_answer_template.rb b/app/commands/decidim/templates/admin/create_proposal_answer_template.rb
diff --git a/app/commands/decidim/templates/admin/update_proposal_answer_template.rb b/app/commands/decidim/templates/admin/update_proposal_answer_template.rb
diff --git a/...ncerns/decidim/reporting_proposals/admin/proposal_answer_templates_controller_override.rb b/...ncerns/decidim/reporting_proposals/admin/proposal_answer_templates_controller_override.rb
@@ -8,6 +8,20 @@ module ProposalAnswerTemplatesControllerOverride
         extend ActiveSupport::Concern
 
         included do
+          def avaliablity_options
+            @avaliablity_options = []
+
+            Decidim::Component.includes(:participatory_space).where(manifest_name: accepted_components)
+                              .select { |a| a.participatory_space.decidim_organization_id == current_organization.id }.each do |component|
+              @avaliablity_options.push [formatted_name(component), component.id]
+            end
+
+            @avaliablity_options.sort_by!(&:first)
+            @avaliablity_options.prepend [t("global_scope", scope: "decidim.templates.admin.proposal_answer_templates.index"), 0]
+          end
+
+          private
+
           def accepted_components
             [:proposals, :reporting_proposals]
           end

diff --git a/app/controllers/concerns/decidim/templates/admin/application_controller_override.rb b/app/controllers/concerns/decidim/templates/admin/application_controller_override.rb