Update cells / Fix specs / Update views

mainio · Jan 7, 2025 · 12fc43f · 12fc43f
1 parent 231ef8e
commit 12fc43f
Show file tree

Hide file tree

Showing 33 changed files with 36 additions and 322 deletions.
diff --git a/Gemfile b/Gemfile
@@ -43,7 +43,7 @@ group :test do
   gem "decidim-accountability", DECIDIM_VERSION
   gem "decidim-proposals", DECIDIM_VERSION
 
-  gem "decidim-ideas", github: "mainio/decidim-module-ideas", branch: "develop"
+  gem "decidim-ideas", github: "mainio/decidim-module-ideas"
   gem "decidim-plans", github: "mainio/decidim-module-plans"
   gem "decidim-tags", github: "mainio/decidim-module-tags"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -22,8 +22,7 @@ GIT
 
 GIT
   remote: https://github.com/mainio/decidim-module-ideas.git
-  revision: f24647d2a8565eb6f7cd0862b08b153315bd9633
-  branch: develop
+  revision: a074486489394221a0e5bf62d709b195a8520002
   specs:
     decidim-ideas (0.28.0)
       decidim-core (~> 0.28.0)

diff --git a/app/cells/concerns/decidim/budgeting_pipeline/project_vote_button_cell_extensions.rb b/app/cells/concerns/decidim/budgeting_pipeline/project_vote_button_cell_extensions.rb
diff --git a/app/cells/decidim/budgets/project_l/data.erb b/app/cells/decidim/budgets/project_l/data.erb
diff --git a/app/cells/decidim/budgets/project_l/extra_data.erb b/app/cells/decidim/budgets/project_l/extra_data.erb
@@ -0,0 +1,20 @@
+<div class="budget__card__list-project">
+  <span class="budget__card__list-project__amount">
+      <% if project.budget_amount > 0 %>
+        <%= budget_to_currency(model.budget_amount) %>
+      <% else %>
+        -
+      <% end %>
+  </span>
+  <%= cell("decidim/budgets/project_vote_button", model, show_only_added:) %>
+
+  <%= link_to resource_path, class: "card__link" do %>
+    <span aria-hidden="true">
+      <%= t(".more_info") %>
+      <%= icon "arrow-right-s-line", role: "img", "aria-hidden": true %>
+    </span>
+    <span class="show-for-sr">
+      <%= t(".more_info_with_title", title: resource_title) %>
+    </span>
+  <% end %>
+</div>
diff --git a/app/cells/decidim/budgets/project_l/inner.erb b/app/cells/decidim/budgets/project_l/inner.erb
diff --git a/app/cells/decidim/budgets/project_l/show.erb b/app/cells/decidim/budgets/project_l/show.erb
diff --git a/app/cells/decidim/budgets/project_l_cell.rb b/app/cells/decidim/budgets/project_l_cell.rb
diff --git a/app/cells/decidim/budgets/project_list_item/project_data.erb b/app/cells/decidim/budgets/project_list_item/project_data.erb
diff --git a/app/cells/decidim/budgets/project_list_item/project_text.erb b/app/cells/decidim/budgets/project_list_item/project_text.erb
diff --git a/app/cells/decidim/budgets/project_m/data.erb b/app/cells/decidim/budgets/project_m/data.erb
diff --git a/app/cells/decidim/budgets/project_m/data_budget.erb b/app/cells/decidim/budgets/project_m/data_budget.erb
diff --git a/app/cells/decidim/budgets/project_m/footer.erb b/app/cells/decidim/budgets/project_m/footer.erb
diff --git a/app/cells/decidim/budgets/project_m/image.erb b/app/cells/decidim/budgets/project_m/image.erb
diff --git a/app/cells/decidim/budgets/project_m/inner.erb b/app/cells/decidim/budgets/project_m/inner.erb
diff --git a/app/cells/decidim/budgets/project_m/show.erb b/app/cells/decidim/budgets/project_m/show.erb
diff --git a/app/cells/decidim/budgets/project_m/state.erb b/app/cells/decidim/budgets/project_m/state.erb
diff --git a/app/cells/decidim/budgets/project_m/status.erb b/app/cells/decidim/budgets/project_m/status.erb
diff --git a/app/cells/decidim/budgets/project_m/tags.erb b/app/cells/decidim/budgets/project_m/tags.erb
diff --git a/app/cells/decidim/budgets/project_m/votes_counter.erb b/app/cells/decidim/budgets/project_m/votes_counter.erb
diff --git a/app/cells/decidim/budgets/project_m/voting_buttons.erb b/app/cells/decidim/budgets/project_m/voting_buttons.erb
diff --git a/app/mailers/decidim/budgets/order_summaries_mailer.rb b/app/mailers/decidim/budgets/order_summaries_mailer.rb
@@ -7,6 +7,7 @@ class OrderSummariesMailer < Decidim::ApplicationMailer
       include Decidim::SanitizeHelper
 
       helper Decidim::TranslationsHelper
+      helper Decidim::SanitizeHelper
 
       # Send an email to an user with the summary of the order.
       #

diff --git a/app/views/decidim/budgets/order_summaries_mailer/order_summaries.html.erb b/app/views/decidim/budgets/order_summaries_mailer/order_summaries.html.erb
@@ -6,7 +6,7 @@
 <p><%= t(".votes_summary") %></p>
 
 <% @orders.each do |order| %>
-  <p><strong><%= translated_attribute(order.budget.title) %></strong></p>
+  <p><strong><%= decidim_sanitize(translated_attribute(order.budget.title)) %></strong></p>
   <% if order.projects.any? %>
     <p><%= t(".selected_projects") %></p>
     <ul>

diff --git a/app/views/decidim/budgets/votes/budgets.html.erb b/app/views/decidim/budgets/votes/budgets.html.erb
@@ -77,4 +77,4 @@
   </button>
 </div>
 
-<%= javascript_pack_tag "decidim_budgeting_pipeline_budgets" %>
+<%= append_javascript_pack_tag "decidim_budgeting_pipeline_budgets" %>
diff --git a/app/views/decidim/budgets/votes/preview.html.erb b/app/views/decidim/budgets/votes/preview.html.erb
@@ -88,4 +88,4 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_budgeting_pipeline_preview" %>
+<%= append_javascript_pack_tag "decidim_budgeting_pipeline_preview" %>
diff --git a/app/views/decidim/budgets/votes/projects.html.erb b/app/views/decidim/budgets/votes/projects.html.erb
@@ -40,4 +40,4 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_budgeting_pipeline_projects" %>
+<%= append_javascript_pack_tag "decidim_budgeting_pipeline_projects" %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -169,6 +169,9 @@ en:
           category_name: Theme
           vote_count: Votes
         filters:
+          activity_values:
+            all: All
+            favorites: My favorites
           budget: Area
           budget_amount_max: Maximum budget
           budget_amount_min: Minimum budget

diff --git a/lib/decidim/budgeting_pipeline/engine.rb b/lib/decidim/budgeting_pipeline/engine.rb
@@ -168,9 +168,6 @@ class Engine < ::Rails::Engine
           Decidim::Budgets::ProjectCell.include(
             Decidim::BudgetingPipeline::ProjectCellExtensions
           )
-          Decidim::Budgets::ProjectVoteButtonCell.include(
-            Decidim::BudgetingPipeline::ProjectVoteButtonCellExtensions
-          )
 
           # Form extensions
           Decidim::Budgets::Admin::ComponentForm.include(

diff --git a/spec/cells/decidim/budgets/project_list_item_cell_spec.rb b/spec/cells/decidim/budgets/project_list_item_cell_spec.rb
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,4 +88,4 @@ @@
       </div>
     </div>
-    <%= javascript_pack_tag "decidim_budgeting_pipeline_preview" %>
+    <%= append_javascript_pack_tag "decidim_budgeting_pipeline_preview" %>