decidim-budgets 0.28.0 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89ac6c19faae87df68dfff2ed5c37e0a56e1416fed7b6861dd6aa0f243eecdfc
-  data.tar.gz: 58596987df45b59f635011d3b248f2dc6208bdcaf9aec8704fc88a82de66174d
+  metadata.gz: 25adb3de8e76859639aa0b00a073ccbf865b1202ffd54d4823d18418b1fd2190
+  data.tar.gz: 8545c893c9a17cb916ff905b19fbfd3a738b210ced76d3370e0618e3b3ce671d
 SHA512:
-  metadata.gz: fafc9329e7b11770f2c72eb06c682681887c8bbecb7b1db4d50268be3a8364f65f9810198e1fbcb5c670e03fbc1651cc2570ca4f0febb161f5a31730d1865f5d
-  data.tar.gz: a72aaea943910985ec26837978526b25a6c2486cfa62e17ac4a60397c7ee403c7b483ddb79b9baebfa51676a24b90e8ef8f118042cbbaa713443ef0f943b9d3a
+  metadata.gz: 5e8dabd13b848ca84e652bd4556f24aaad71b009406117b476640dbc60d897be125362847a2fd7c5fad2a5e574478e79c004eac1f391afbbbf056f11b0a92f2a
+  data.tar.gz: 9b47e5be95478876f53b9bc091855a9c4c2c841b0452b1788d802eb9eb7fcf1ebe29d52d855f807c510bb6b09ee45dd052d0130dcf90fe239988355596516168

data/app/cells/decidim/budgets/base_cell.rb

@@ -13,7 +13,7 @@ module Decidim
       delegate :settings, to: :current_component
 
       def budgets_link_list(budgets)
-        budgets.map { |budget| link_to(translated_attribute(budget.title), resource_locator(budget).path) }
+        budgets.map { |budget| link_to(decidim_escape_translated(budget.title), resource_locator(budget).path) }
                .to_sentence
                .html_safe
       end

data/app/cells/decidim/budgets/budget_list_item/show.erb

@@ -2,7 +2,7 @@
   <div class="card__highlight-text md:w-[70%] p-0">
     <%= link_to resource_path, class: "p-4" do %>
       <h3 class="h3 text-secondary inline-block align-middle">
-        <%= translated_attribute(title) %>
+        <%= decidim_escape_translated(title) %>
       </h3>
       <% if voted? %>
         <%= icon "check-double-line", class: "inline-block align-middle fill-success ml-2 h-[1.5em] w-[1.5em]" %>

data/app/cells/decidim/budgets/budgets_list/main_list.erb

@@ -1,5 +1,5 @@
 <h2 class="h5 md:h3 decorator"><%= t(:count, scope: i18n_scope, count: budgets.length) %></h2>
 
-<%= render partial: "decidim/shared/orders", formats: [:html], locals: { orders: AVAILABLE_ORDERS, i18n_scope: "decidim.budgets.projects.orders" } %>
+<%= render partial: "decidim/shared/orders", formats: [:html], locals: { orders: AVAILABLE_ORDERS, i18n_scope: "decidim.budgets.budgets_list.orders" } %>
 
 <%= render :card_list %>

data/app/cells/decidim/budgets/project_tags/show.erb

@@ -1,6 +1,5 @@
 <%= content_tag :ul, class: tags_classes do %>
-  <%= icon "price-tag-3-line", class: "inline-block" %>
+  <%= content_tag :li, icon("price-tag-3-line", class: "inline-block") %>
   <%= content_tag :li, link_to_category if category? %>
-
   <%= content_tag :li, link_to_scope if scope? %>
 <% end %>

data/app/controllers/decidim/budgets/admin/projects_controller.rb

@@ -19,7 +19,8 @@ module Decidim
         def new
           enforce_permission_to :create, :project
           @form = form(ProjectForm).from_params(
-            attachment: form(AttachmentForm).instance
+            { attachment: form(AttachmentForm).instance },
+            budget:
           )
         end
 
@@ -43,7 +44,7 @@ module Decidim
 
         def edit
           enforce_permission_to(:update, :project, project:)
-          @form = form(ProjectForm).from_model(project)
+          @form = form(ProjectForm).from_model(project, budget:)
           @form.attachment = form(AttachmentForm).instance
         end
 

data/app/controllers/decidim/budgets/line_items_controller.rb

@@ -12,15 +12,21 @@ module Decidim
         enforce_permission_to :vote, :project, project:, budget:, workflow: current_workflow
 
         respond_to do |format|
-          AddLineItem.call(persisted_current_order, project, current_user) do
-            on(:ok) do |order|
-              self.current_order = order
-              format.html { redirect_back(fallback_location: budget_path(budget)) }
-              format.js { render "update_budget" }
-            end
-
-            on(:invalid) do
-              format.js { render "update_budget", status: :unprocessable_entity }
+          # Note that the user-specific lock here is important in order to
+          # prevent multiple simultaneous processes on different machines from
+          # creating multiple orders for the same user in case the button is
+          # pressed multiple times.
+          current_user.with_lock do
+            AddLineItem.call(persisted_current_order, project, current_user) do
+              on(:ok) do |order|
+                self.current_order = order
+                format.html { redirect_back(fallback_location: budget_path(budget)) }
+                format.js { render "update_budget" }
+              end
+
+              on(:invalid) do
+                format.js { render "update_budget", status: :unprocessable_entity }
+              end
             end
           end
         end

data/app/helpers/decidim/budgets/projects_helper.rb

@@ -126,12 +126,12 @@ module Decidim
         project.latitude.present? && project.longitude.present?
       end
 
-      def filter_addition_type_values(added_count:)
+      def filter_addition_type_values
         return [] if voting_finished?
 
         [
-          ["all", { text: t("all", scope: "decidim.budgets.projects.project_filter"), count: nil }],
-          ["added", { text: t("added", scope: "decidim.budgets.projects.project_filter"), count: added_count }]
+          ["all", t("all", scope: "decidim.budgets.projects.project_filter")],
+          ["added", t("added", scope: "decidim.budgets.projects.project_filter")]
         ]
       end
 
@@ -162,7 +162,7 @@ module Decidim
         references = Budget.joins(:component)
                            .where(component: { participatory_space: current_participatory_space }).order(weight: :asc)
         references.map do |budget|
-          ["#{" " * 4} #{translated_attribute(budget.title)}".html_safe, budget.id]
+          ["#{" " * 4} #{decidim_escape_translated(budget.title)}".html_safe, budget.id]
         end
       end
     end

data/app/packs/src/decidim/budgets/exit_handler.js

@@ -68,7 +68,7 @@ $(() => {
     }
 
     $exitLink.attr("href", url);
-    $exitLink.html(exitLinkText);
+    $exitLink.text(exitLinkText);
     window.Decidim.currentDialogs["exit-notification"].open();
   };
 

data/app/views/decidim/budgets/admin/budgets/edit.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

data/app/views/decidim/budgets/admin/budgets/index.html.erb

@@ -1,7 +1,7 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="card">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t(".title") %>
       <% if allowed_to? :export, :budget %>
         <%= export_dropdown %>
@@ -13,7 +13,7 @@
         <%= link_to t("actions.new_budget", scope: "decidim.budgets"), new_budget_path, class: "button button__sm button__secondary" if allowed_to? :create, :budget %>
       </div>
       <%= render partial: "decidim/admin/components/resource_action" %>
-    </h2>
+    </h1>
   </div>
   <div class="table-scroll">
     <table class="table-list">
@@ -22,7 +22,9 @@
           <th><%= t("models.budget.fields.name", scope: "decidim.budgets") %></th>
           <th><%= t("models.budget.fields.total_budget", scope: "decidim.budgets") %></th>
           <th><%= t("models.budget.fields.projects_count", scope: "decidim.budgets") %></th>
-          <%= th_resource_scope_label %>
+          <% if current_component.has_subscopes? %>
+           <%= th_resource_scope_label %>
+          <% end %>
           <th class="actions"><%= t("actions.title", scope: "decidim.budgets") %></th>
         </tr>
       </thead>
@@ -42,7 +44,9 @@
             <td>
               <%= link_to budget.projects.count, budget_projects_path(budget) %>
             </td>
-            <%= td_resource_scope_for(budget.scope) %>
+            <% if current_component.has_subscopes? %>
+              <%= td_resource_scope_for(budget.scope) %>
+            <% end %>
             <td class="table-list__actions">
               <% if allowed_to? :update, :budget, budget: budget %>
                 <%= icon_link_to "pencil-line", edit_budget_path(budget), t("actions.edit", scope: "decidim.budgets"), class: "action-icon--edit" %>

data/app/views/decidim/budgets/admin/budgets/new.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

data/app/views/decidim/budgets/admin/projects/_project-tr.html.erb

@@ -17,15 +17,17 @@
       <%= translated_attribute project.category.name %>
     <% end %>
   </td>
-  <%= td_resource_scope_for(project.scope) %>
+  <% if current_component.has_subscopes? %>
+    <%= td_resource_scope_for(project.scope) %>
+  <% end %>
   <td>
     <%= project.confirmed_orders_count %>
   </td>
   <td>
     <% if project.selected? %>
-      <%= content_tag :strong, t("projects.index.selected", scope: "decidim.budgets.admin"), class: "text-success" %>
+      <%= content_tag :strong, t("yes", scope: "decidim.budgets.admin.projects.index.selected_options"), class: "label success" %>
     <% else %>
-      <%= content_tag :span, "close-line", class: "text-muted" %>
+      <%= content_tag :strong, t("no", scope: "decidim.budgets.admin.projects.index.selected_options"), class: "label" %>
     <% end %>
   </td>
   <td class="table-list__actions">

data/app/views/decidim/budgets/admin/projects/edit.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title("#{translated_attribute(budget.title)} - #{t(".title")}") %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
-    <%= "#{translated_attribute(budget.title)} #{t(".title")}" %>
-  </h2>
+  <h1 class="item_show__header-title">
+    <%= "#{decidim_escape_translated(budget.title)} #{t(".title")}" %>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

data/app/views/decidim/budgets/admin/projects/index.html.erb

@@ -1,14 +1,14 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="card">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <div>
-        <%= link_to translated_attribute(budget.title), budgets_path %> &gt;
+        <%= link_to decidim_escape_translated(budget.title), budgets_path %> &gt;
         <%= t(".title") %>
         <span id="js-selected-resources-count" class="component-counter component-counter--inline" title="<%= t("decidim.budgets.admin.projects.index.selected") %>"></span>
       </div>
       <%= render partial: "bulk-actions" %>
-    </h2>
+    </h1>
   </div>
   <%= admin_filter_selector(:projects) %>
   <div class="table-scroll">
@@ -19,7 +19,9 @@
           <th><%= sort_link(query, :id, t("models.project.fields.id", scope: "decidim.budgets"), default_order: :desc) %></th>
           <th class="!text-left"><%= sort_link(query, :title, t("models.project.fields.title", scope: "decidim.budgets")) %></th>
           <th><%= sort_link(query, :category_name, t("models.project.fields.category", scope: "decidim.budgets") ) %></th>
-          <%= th_scope_sort_link %>
+          <% if current_component.has_subscopes? %>
+            <%= th_scope_sort_link %>
+          <% end %>
           <th><%= sort_link(query, :confirmed_orders_count, t("index.confirmed_orders_count")) %></th>
           <th><%= sort_link(query, :selected, t(".selected")) %></th>
           <th class="actions"><%= t("actions.title", scope: "decidim.budgets") %></th>

data/app/views/decidim/budgets/admin/projects/new.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title("#{translated_attribute(budget.title)} - #{t(".title")}") %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
-    <%= "#{translated_attribute(budget.title)} &gt; #{t(".title")}".html_safe %>
-  </h2>
+  <h1 class="item_show__header-title">
+    <%= "#{decidim_escape_translated(budget.title)} &gt; #{t(".title")}".html_safe %>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

data/app/views/decidim/budgets/admin/proposals_imports/new.html.erb

@@ -1,9 +1,9 @@
 <% add_decidim_page_title(t(".title")) %>
 
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

data/app/views/decidim/budgets/projects/_addition_selector.html.erb

@@ -1,15 +1,16 @@
 <%= filter_form_for filter, url_for, data: { filters: "", component: "accordion" } do |form| %>
   <%= form.collection_radio_buttons(
         :addition_type,
-        filter_addition_type_values(added_count: search.result.with_order(current_order).size),
+        filter_addition_type_values,
         :first,
         :last
       ) do |builder|
+      added_count = search.result.with_order(current_order).size unless builder.value == "all"
       builder.label(class: "button button__xs button__pill #{filter.addition_type == builder.value ? 'button__pill--active' : ''}") do %>
       <span>
-        <%= builder.text[:text] %>
+        <%= builder.text %>
       </span>
-      <%= render partial: "projects_count", locals: { count: builder.text[:count] } %>
+      <%= render partial: "projects_count", locals: { count: added_count } %>
       <%= builder.radio_button(class: "!hidden") %>
     <% end %>
   <% end %>

data/app/views/decidim/budgets/projects/_exit_modal.html.erb

@@ -11,7 +11,7 @@
     </div>
     <div data-dialog-actions>
       <button data-dialog-close="exit-notification" class="button button__sm md:button__lg button__secondary">
-        <p><%= t("cancel", scope: "decidim.budgets.projects.exit_modal") %></p>
+        <%= t("cancel", scope: "decidim.budgets.projects.exit_modal") %>
       </button>
       <%= link_to t("exit", scope: "decidim.budgets.projects.exit_modal"), budget_projects_path, id: "exit-notification-link", class: "button button__sm md:button__lg button__secondary" %>
     </div>

data/app/views/decidim/budgets/projects/show.html.erb

@@ -38,7 +38,7 @@ edit_link(
       <% end %>
       <%= cell("decidim/budgets/project_selected_status", project, as_label: true) %>
       <h1 class="h1 decorator budget__definition-project__title editor-content">
-        <%= decidim_sanitize_editor translated_attribute project.title %>
+        <%= decidim_sanitize translated_attribute project.title %>
       </h1>
     </section>
     <section class="layout-main__section">

data/config/locales/ar.yml

@@ -60,7 +60,12 @@ ar:
             change_category: تغيير الفئة
             finished_orders: الانتهاء من الأصوات
             pending_orders: في انتظار الأصوات
+            selected_options:
+              'no': 'لا'
+              'yes': 'نعم'
             title: مشاريع
+            update: تحديث
+            update_budget_button: تحديث ميزانية المشروع
           new:
             create: إنشاء
             title: مشروع جديد
@@ -78,6 +83,8 @@ ar:
       budget_information_modal:
         continue: مواصلة
         more_information: المزيد من المعلومات
+      budgets_list:
+        budgets: الميزانيات
       models:
         budget:
           fields: