From 1fa565dc74feb7c75a1b6a3ee70b24d4aeefa3bd Mon Sep 17 00:00:00 2001 From: Laura J <75725233+laurajaime@users.noreply.github.com> Date: Wed, 16 Oct 2024 11:13:28 +0200 Subject: [PATCH] Fix translation and update solutions (#73) * Fix translation and update solutions * Change version and fix syntax error in translation --- CHANGELOG.md | 4 ++++ Gemfile.lock | 2 +- .../decidim/solutions/admin/solutions_controller.rb | 2 +- app/controllers/decidim/solutions/solutions_controller.rb | 2 +- app/views/decidim/solutions/solutions/show.html.erb | 2 +- config/locales/ca.yml | 1 + lib/decidim/challenges/version.rb | 2 +- 7 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2a8b53..1bc598d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ Following Semantic Versioning 2. ## next version: +## Version 0.4.1.1 (PATCH) +- Add missing translation. +- Fix update solution in backoffice. + ## Version 0.4.1 (PATCH) - Add new fields and refactor status field in solutions show on public page. - Fix error in create solutions in backoffice. diff --git a/Gemfile.lock b/Gemfile.lock index d6bd522..1cb5e92 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -174,7 +174,7 @@ GIT PATH remote: . specs: - decidim-challenges (0.4.1) + decidim-challenges (0.4.1.1) decidim-core (~> 0.27) GEM diff --git a/app/controllers/decidim/solutions/admin/solutions_controller.rb b/app/controllers/decidim/solutions/admin/solutions_controller.rb index 9a0f18d..5e16a04 100644 --- a/app/controllers/decidim/solutions/admin/solutions_controller.rb +++ b/app/controllers/decidim/solutions/admin/solutions_controller.rb @@ -49,7 +49,7 @@ def edit def update enforce_permission_to :edit, :solution, solution: solution - @form = form(Decidim::Solutions::Admin::SolutionsForm).from_params(params) + @form = form(Decidim::Solutions::Admin::SolutionsForm).from_params(params.merge({ author_id: current_user.id })) Decidim::Solutions::Admin::UpdateSolution.call(@form, solution) do on(:ok) do |_solution| diff --git a/app/controllers/decidim/solutions/solutions_controller.rb b/app/controllers/decidim/solutions/solutions_controller.rb index f793a66..14c1da8 100644 --- a/app/controllers/decidim/solutions/solutions_controller.rb +++ b/app/controllers/decidim/solutions/solutions_controller.rb @@ -97,7 +97,7 @@ def challenge_scope @challenge_scope ||= if @solution.problem.present? current_organization.scopes.find_by(id: @solution.problem.challenge.decidim_scope_id) else - current_organization.scopes.find_by(id: @solution.challenge.decidim_scope_id) + current_organization.scopes.find_by(id: @solution.challenge&.decidim_scope_id) end end diff --git a/app/views/decidim/solutions/solutions/show.html.erb b/app/views/decidim/solutions/solutions/show.html.erb index 20c209e..01f5dcd 100644 --- a/app/views/decidim/solutions/solutions/show.html.erb +++ b/app/views/decidim/solutions/solutions/show.html.erb @@ -102,7 +102,7 @@ <% end %> <% else %> - <% if @solution.challenge.sdg_code %> + <% if @solution.challenge&.sdg_code %>
<%= t("sdg", scope: "activemodel.attributes.challenge") %>
diff --git a/config/locales/ca.yml b/config/locales/ca.yml index da076d3..6104d42 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -1198,6 +1198,7 @@ ca: edit_documents: Edita documents create: success: La solució s'ha creat correctament i serà revisada per un administrador. + error: Hi ha hagut un problema al crear aquesta solució solutions: empty: No s'han pogut trobar solucions empty_filters: No s'han pogut trobar solucions diff --git a/lib/decidim/challenges/version.rb b/lib/decidim/challenges/version.rb index 461dc5b..2ac78d2 100644 --- a/lib/decidim/challenges/version.rb +++ b/lib/decidim/challenges/version.rb @@ -4,7 +4,7 @@ module Decidim # This holds the decidim-meetings version. module Challenges def self.version - "0.4.1" + "0.4.1.1" end def self.decidim_version