decidim-budgets 0.28.0 → 0.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89ac6c19faae87df68dfff2ed5c37e0a56e1416fed7b6861dd6aa0f243eecdfc
-  data.tar.gz: 58596987df45b59f635011d3b248f2dc6208bdcaf9aec8704fc88a82de66174d
+  metadata.gz: f74010a6407721a22ccea55ff3000474e1d75020ea72f20fe86480ee3722a5f5
+  data.tar.gz: 140f5940e7d92c8d23f5723889d98d5a070eb4cf56610bdbe5c0c60daaf62e87
 SHA512:
-  metadata.gz: fafc9329e7b11770f2c72eb06c682681887c8bbecb7b1db4d50268be3a8364f65f9810198e1fbcb5c670e03fbc1651cc2570ca4f0febb161f5a31730d1865f5d
-  data.tar.gz: a72aaea943910985ec26837978526b25a6c2486cfa62e17ac4a60397c7ee403c7b483ddb79b9baebfa51676a24b90e8ef8f118042cbbaa713443ef0f943b9d3a
+  metadata.gz: ceee4dca8bcfd229a88593d87d571f1aa8620ce33fe055a22e517e8c6048059dd18393995a8f0ed12b606233d72bc7530c06c168ae0e3bf5f498191796e27e05
+  data.tar.gz: ec189ca3f9e9b98c057fdc0e711a5ea504fa794d26c2187a9f7df1a8f23472a1c382da29756ad7baeb3577e9212e476389611ecaf3ebd9f1c76c5b179bb6edd9

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/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

@@ -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/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:

data/config/locales/ca.yml

@@ -105,6 +105,9 @@ ca:
             pending_orders: Vots en procés
             select_for_implementation: Seleccionat per implementar
             selected: Seleccionat
+            selected_options:
+              'no': 'No'
+              'yes': 'Sí'
             title: Projectes
             update: Actualitzar
             update_budget_button: Actualitzar el pressupost del projecte
@@ -358,7 +361,7 @@ ca:
       budgets:
         budget_published:
           email_intro: 'Ja està activa la fase %{resource_title} per a %{participatory_space_title}. Pots veure-la des d''aquesta pàgina:'
-          email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai %{participatory_space_title}. Pots deixar de rebre notificacions a través de l'enllaç anterior.
+          email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{participatory_space_title}". Pots deixar de rebre notificacions a través de l'enllaç anterior.
           email_subject: El component %{resource_title} ja està actiu per %{participatory_space_title}.
           notification_title: El pressupost <a href="%{resource_path}">%{resource_title}</a> a %{participatory_space_title} ja està actiu.
     orders:

data/config/locales/cs.yml

@@ -109,6 +109,9 @@ cs:
             pending_orders: Čeká na hlasování
             select_for_implementation: Vybrat pro implementaci
             selected: Vybrané
+            selected_options:
+              'no': 'Ne'
+              'yes': 'Ano'
             title: Projekty
             update: Aktualizovat
             update_budget_button: Aktualizovat rozpočet projektu

data/config/locales/de.yml

@@ -105,6 +105,9 @@ de:
             pending_orders: Ausstehende Stimmen
             select_for_implementation: Zur Umsetzung auswählen
             selected: Ausgewählt
+            selected_options:
+              'no': 'Nein'
+              'yes': 'Ja'
             title: Projekte
             update: Aktualisieren
             update_budget_button: Projektbudget aktualisieren
@@ -212,7 +215,7 @@ de:
           voted_on_space_with_scope: Sie haben für das %{budget_name} Budget for the %{space_name} innerhalb %{scope_name} (%{scope_type}) abgestimmt.
       projects:
         budget_confirm:
-          are_you_sure: Wenn du deine Meinung änderst, kannst du deine Stimme nachträglich ändern.
+          are_you_sure: Wenn Sie Ihre Meinung ändern, können Sie Ihre Stimme nachträglich ändern.
           cancel: Abbrechen
           confirm: Bestätigen
           description: Dies sind die Projekte, die Sie für das Budget ausgewählt haben.
@@ -376,4 +379,4 @@ de:
       orders_count: Projektauswahlen
       projects_count: Projekte
   index:
-    confirmed_orders_count: Stimmen zählen
+    confirmed_orders_count: Anzahl Stimmen

data/config/locales/en.yml

@@ -105,6 +105,9 @@ en:
             pending_orders: Pending votes
             select_for_implementation: Select for implementation
             selected: Selected
+            selected_options:
+              'no': 'No'
+              'yes': 'Yes'
             title: Projects
             update: Update
             update_budget_button: Update project's budget

data/config/locales/es-MX.yml

@@ -105,6 +105,9 @@ es-MX:
             pending_orders: Votos pendientes
             select_for_implementation: Seleccionado para implementar
             selected: Seleccionado
+            selected_options:
+              'no': 'No'
+              'yes': 'Sí'
             title: Proyectos
             update: Actualizar
             update_budget_button: Actualizar el presupuesto del proyecto

data/config/locales/es-PY.yml

@@ -105,6 +105,9 @@ es-PY:
             pending_orders: Votos pendientes
             select_for_implementation: Seleccionado para implementar
             selected: Seleccionado
+            selected_options:
+              'no': 'No'
+              'yes': 'Sí'
             title: Proyectos
             update: Actualizar
             update_budget_button: Actualizar el presupuesto del proyecto

data/config/locales/es.yml

@@ -105,6 +105,9 @@ es:
             pending_orders: Votos pendientes
             select_for_implementation: Seleccionado para implementar
             selected: Seleccionado
+            selected_options:
+              'no': 'No'
+              'yes': 'Sí'
             title: Proyectos
             update: Actualizar
             update_budget_button: Actualizar el presupuesto del proyecto
@@ -358,7 +361,7 @@ es:
       budgets:
         budget_published:
           email_intro: 'Ya está activa la fase %{resource_title} para %{participatory_space_title}. Puedes verla desde esta página:'
-          email_outro: Has recibido esta notificación porque estás siguiendo %{participatory_space_title}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+          email_outro: Has recibido esta notificación porque estás siguiendo el espacio "%{participatory_space_title}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
           email_subject: El componente %{resource_title} está ahora activo para %{participatory_space_title}.
           notification_title: El presupuesto <a href="%{resource_path}">%{resource_title}</a> en %{participatory_space_title} ya está activo.
     orders:

data/config/locales/eu.yml

@@ -105,6 +105,9 @@ eu:
             pending_orders: Zain dauden botoak
             select_for_implementation: Hautatu gauzatzeko
             selected: Hautatua
+            selected_options:
+              'no': 'Ez'
+              'yes': 'Bai'
             title: Proiektuak
             update: Eguneratu
             update_budget_button: Eguneratu proiektuaren aurrekontua

data/config/locales/fi-plain.yml

@@ -105,6 +105,9 @@ fi-pl:
             pending_orders: Odottavat äänet
             select_for_implementation: Valittu toteutukseen
             selected: Valittu
+            selected_options:
+              'no': 'Ei'
+              'yes': 'Kyllä'
             title: Suunnitelmat
             update: Päivitä
             update_budget_button: Päivitä hankkeen budjetti

data/config/locales/fi.yml

@@ -105,6 +105,9 @@ fi:
             pending_orders: Odottavat äänet
             select_for_implementation: Valittu toteutukseen
             selected: Valittu
+            selected_options:
+              'no': 'Ei'
+              'yes': 'Kyllä'
             title: Hankkeet
             update: Päivitä
             update_budget_button: Päivitä hankkeen budjetti

data/config/locales/fr-CA.yml

@@ -105,6 +105,9 @@ fr-CA:
             pending_orders: Votes en cours
             select_for_implementation: Sélectionné pour implémentation
             selected: Sélectionné
+            selected_options:
+              'no': 'Non'
+              'yes': 'Oui'
             title: Projets
             update: Mettre à jour
             update_budget_button: Mettre à jour le budget du projet

data/config/locales/fr.yml

@@ -105,6 +105,9 @@ fr:
             pending_orders: Votes en cours
             select_for_implementation: Sélectionné pour implémentation
             selected: Sélectionné
+            selected_options:
+              'no': 'Non'
+              'yes': 'Oui'
             title: Projets
             update: Mettre à jour
             update_budget_button: Mettre à jour le budget du projet

data/config/locales/he-IL.yml

@@ -0,0 +1 @@
+he:

data/config/locales/hu.yml

@@ -46,6 +46,8 @@ hu:
         edit: Szerkesztés
         edit_projects: Projektek kezelése
         import: Javaslatok importálása projektekhez
+        new_budget: Új költségvetés
+        new_project: Új projekt
         preview: Előnézet
         send_voting_reminders: Szavazási emlékeztetők kiküldése
         title: Műveletek
@@ -91,6 +93,7 @@ hu:
           index:
             actions: Műveletek
             cancel: Mégsem
+            change_budget: Költségvetés megváltoztatása
             change_category: Kategória módosítása
             change_scope: Hatáskör megváltoztatása
             change_selected: Kijelölés módosítása
@@ -99,8 +102,11 @@ hu:
             pending_orders: Függőben lévő szavazások
             select_for_implementation: Kijelölés megvalósításra
             selected: Kiválasztva
+            selected_options:
+              'yes': 'Igen'
             title: Projektek
             update: Frissítés
+            update_budget_button: A projekt költségvetésének frissítése
             update_scope_button: Hatáskör frissítése
           new:
             create: Létrehozás
@@ -108,6 +114,9 @@ hu:
           update:
             invalid: Probléma történt a projekt frissítése során.
             success: Projekt frissítése sikeres.
+          update_budget:
+            select_a_project: Kérem, válasszon projektet.
+            success: 'A projektek sikeresen frissültek a(z) %{subject_name} költségvetésre: %{projects}.'
           update_category:
             invalid: 'Ezeknek a javaslatoknak már megvolt a(z) %{subject_name} kategóriája: %{projects}.'
             select_a_category: Kérlek, válassz kategóriát.
@@ -136,6 +145,7 @@ hu:
             no_components: Ebben a részvételi térben nincs más javaslat-összetevő a javaslatok projektekbe való importálásához.
             origin_component_id: A komponens származása
             select_component: Válassz ki egy elemet
+            title: Javaslatok importálása projektekhez
         reminders:
           orders:
             description: A felhasználók egy e-mailt kapnak, amely linkeket tartalmaz a költségvetésekre, ahol függőben lévő sorrendjük van.
@@ -219,6 +229,7 @@ hu:
           projects_count:
             one: 1 projekt
             other: "%{count} projektek"
+        empty: Még nincsenek projektek
         exit_modal:
           cancel: Vissza a szavazáshoz
           exit: Kilépés a szavazásból
@@ -273,6 +284,7 @@ hu:
         select_projects: Projektek kiválasztása
         show:
           budget: Költségvetés
+      prompt: Költségvetés választása
       vote_reminder_mailer:
         vote_reminder:
           email_budgets: 'Nem fejezte be a szavazat leadását itt:'

data/config/locales/ja.yml

@@ -103,6 +103,9 @@ ja:
             pending_orders: 保留中の投票
             select_for_implementation: 実装のために選択
             selected: 選択済
+            selected_options:
+              'no': 'いいえ'
+              'yes': 'はい'
             title: プロジェクト
             update: 更新
             update_budget_button: プロジェクトの予算を更新

data/config/locales/ko.yml

@@ -1 +1,58 @@
+---
 ko:
+  activemodel:
+    attributes:
+      budget:
+        decidim_scope_id: 범위
+        description: 상세정보
+        title: 제목
+      project:
+        decidim_category_id: 카테고리
+        decidim_scope_id: 범위
+        description: 상세정보
+        proposal_ids: 포함된 제안
+        proposals: 제안
+        title: 제목
+      proposals_import:
+        scope_id: 범위
+  activerecord:
+    models:
+      decidim/budgets/project:
+        other: 프로젝트
+  decidim:
+    admin:
+      filters:
+        projects:
+          category_id_eq:
+            label: 카테고리
+          scope_id_eq:
+            label: 범위
+          selected_at_null:
+            label: 선택됨
+    budgets:
+      actions:
+        attachment_collections: 폴더
+        attachments: 첨부 파일
+      admin:
+        projects:
+          create:
+            success: 프로젝트가 성공적으로 생성되었습니다.
+          destroy:
+            success: 프로젝트가 성공적으로 삭제되었습니다.
+          edit:
+            title: 프로젝트 수정
+            update: 업데이트
+          index:
+            actions: 작업
+            cancel: 취소
+            change_category: 카테고리 변경
+            change_scope: 범위 변경
+            title: 프로젝트
+            update: 업데이트
+            update_scope_button: 범위 업데이트
+          new:
+            create: 생성하기
+            title: 새 프로젝트
+          update:
+            invalid: 이 프로젝트를 업데이트하는 동안 문제가 발생했습니다.
+            success: 프로젝트가 성공적으로 업데이트되었습니다.