decidim-budgets 0.32.0 → 0.32.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f520d8d7c40ec672a9ec5a891aa9dc77557b51e136414c5971b46933d3682ba7
-  data.tar.gz: cb50f451f7a4815bb447cf5a023aca5d9a09d0f33e0725b15377ae35a055a95c
+  metadata.gz: d5c1ed4bb5c02da481f1465b87c601a55e938cc6a5df63db791bd426fd1e5043
+  data.tar.gz: 7154214766c8618df4ec228911218147f9f9e00def187aec3a89d048e389a3bb
 SHA512:
-  metadata.gz: b9fa084355a7679cbdc24491c6f405c661428e61ce6cfcfa34fe49be20340a2ccb0d9885cece8ff4576a6bb6421e1d376f0bde1dac50b229226bd467a37a1fb8
-  data.tar.gz: 0d9dcb05f8501a224548fb72e9443e15ca827b5bc15a72af2a36836d8e9ee555f6162129eac5ee8ad547b16727954226214b362ca64ceca92c949c78d2e24613
+  metadata.gz: 6eeeafe850e71e9dc78513267837becc86bbfa88c39e935763f0bc7768014deccb71d65e5274808e143372280642eed14f8b85f4aec464d04427e026485a9723
+  data.tar.gz: 49c2818831eae88eee5f6648d59699fcca88b0eb766c0ae29a551a5677739961bc23840d38bf4737b30ad8d3ca7cfa6e94724e8e41cfaa328def3aa305e4cd0e

data/app/controllers/concerns/decidim/budgets/needs_current_order.rb

@@ -18,14 +18,6 @@ module Decidim
           @current_order ||= Order.includes(:projects).find_or_initialize_by(user: current_user, budget:)
         end
 
-        def current_order=(order)
-          @current_order = order
-        end
-
-        def persisted_current_order
-          current_order if current_order&.persisted?
-        end
-
         def can_have_order?
           current_user.present? &&
             voting_open? &&
@@ -37,6 +29,16 @@ module Decidim
         def voted_for?(project)
           current_order && current_order.projects.include?(project)
         end
+
+        private
+
+        def current_order=(order)
+          @current_order = order
+        end
+
+        def persisted_current_order
+          current_order if current_order&.persisted?
+        end
       end
     end
   end

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

@@ -8,6 +8,8 @@ module Decidim
       class AttachmentCollectionsController < Admin::ApplicationController
         include Decidim::Admin::Concerns::HasAttachmentCollections
 
+        protected
+
         def after_destroy_path
           project_attachment_collections_path(project, project.component, current_participatory_space)
         end

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

@@ -9,6 +9,8 @@ module Decidim
       class AttachmentsController < Admin::ApplicationController
         include Decidim::Admin::Concerns::HasAttachments
 
+        protected
+
         def after_destroy_path
           budget_projects_path(project.budget)
         end

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

@@ -77,7 +77,7 @@ module Decidim
         end
 
         def orders
-          @orders ||= Order.where(budget: budgets)
+          @orders ||= Order.where(budget: budgets) # rubocop:disable Decidim/OrganizationScopedFinder -- budgets are scoped to current_component above
         end
 
         def pending_orders

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

@@ -15,10 +15,6 @@ module Decidim
 
         helper_method :projects, :finished_orders, :pending_orders, :present, :project_ids
 
-        def collection
-          @collection ||= budget.projects.page(params[:page]).per(15)
-        end
-
         def new
           enforce_permission_to :create, :project
           @form = form(ProjectForm).from_params(
@@ -71,7 +67,7 @@ module Decidim
         def update_taxonomies
           enforce_permission_to :update, :project_taxonomy
 
-          UpdateResourcesTaxonomies.call(params[:taxonomies], Decidim::Budgets::Project.where(id: project_ids), current_organization) do
+          UpdateResourcesTaxonomies.call(params[:taxonomies], budget.projects.where(id: project_ids), current_organization) do
             on(:invalid_taxonomies) do
               flash[:error] = I18n.t(
                 "projects.update_taxonomies.select_a_taxonomy",
@@ -163,6 +159,10 @@ module Decidim
 
         private
 
+        def collection
+          @collection ||= budget.projects.page(params[:page]).per(15)
+        end
+
         def trashable_deleted_resource_type
           :project
         end
@@ -180,7 +180,7 @@ module Decidim
         end
 
         def orders
-          @orders ||= Order.where(budget:)
+          @orders ||= Order.where(budget:) # rubocop:disable Decidim/OrganizationScopedFinder -- budget is scoped to current_component in ApplicationController
         end
 
         def project_ids
@@ -190,7 +190,9 @@ module Decidim
         def reference_budget
           return unless params[:reference_id]
 
-          Budget.find(params[:reference_id])
+          Budget.joins(:component)
+                .where(component: { participatory_space: current_participatory_space })
+                .find(params.expect(:reference_id))
         end
 
         def pending_orders
@@ -204,7 +206,7 @@ module Decidim
         def sample_project
           return if project_ids.empty?
 
-          Decidim::Budgets::Project.find(project_ids.first)
+          budget.projects.find(project_ids.first)
         end
 
         def project

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

@@ -34,7 +34,7 @@ module Decidim
           component = current_participatory_space.components.find_by(id: params[:origin_id])
 
           if component
-            states = Decidim::Proposals::ProposalState
+            states = Decidim::Proposals::ProposalState # rubocop:disable Decidim/OrganizationScopedFinder -- component is scoped above via current_participatory_space
                      .where(component:)
                      .map { |s| { token: s.token, title: translated_attribute(s.title) } }
             states << { token: "not_answered", title: I18n.t("decidim.proposals.answers.not_answered") }

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

@@ -8,7 +8,7 @@ module Decidim
     # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Components::BaseController
-      helper_method :current_workflow, :voting_finished?, :voting_open?, :show_votes_count?
+      helper_method :current_workflow, :voting_finished?, :voting_open?, :show_votes_count?, :resource_added?
 
       def current_workflow
         @current_workflow ||= Decidim::Budgets.workflows[workflow_name].new(current_component, current_user)

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

@@ -9,9 +9,13 @@ module Decidim
       include Decidim::Budgets::Orderable
       include Decidim::TranslatableAttributes
 
-      def index; end
+      def index
+        enforce_permission_to :read, :budget
+      end
 
       def show
+        enforce_permission_to(:read, :budget, budget:)
+
         raise ActionController::RoutingError, "Not Found" unless budget
 
         redirect_to budget_projects_path(budget)

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

@@ -35,6 +35,8 @@ module Decidim
       end
 
       def destroy
+        enforce_permission_to :vote, :project, project:, budget:, workflow: current_workflow
+
         respond_to do |format|
           RemoveLineItem.call(current_order, project) do
             on(:ok) do |_order|

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

@@ -26,6 +26,8 @@ module Decidim
       end
 
       def destroy
+        enforce_permission_to :destroy, :order, order: current_order
+
         CancelOrder.call(current_order) do
           on(:ok) do
             flash[:notice] = I18n.t("orders.destroy.success", scope: "decidim")
@@ -40,6 +42,8 @@ module Decidim
       end
 
       def status
+        enforce_permission_to :read, :order, order: current_order
+
         redirect_to redirect_path unless current_order.persisted?
       end
 

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

@@ -15,12 +15,16 @@ module Decidim
       before_action :set_focus_mode_if_voting_open
 
       def index
+        enforce_permission_to :read, :project
+
         raise ActionController::RoutingError, "Not Found" unless budget
       end
 
       def show
         raise ActionController::RoutingError, "Not Found" unless budget
         raise ActionController::RoutingError, "Not Found" unless project
+
+        enforce_permission_to :read, :project, project:
       end
 
       private

data/app/packs/stylesheets/budgets.scss

@@ -1,6 +1,6 @@
 .budget {
   &-list__map {
-    @apply lg:-ml-16 -mt-6 lg:-mt-12 mb-6 aspect-square lg:aspect-[21/9] [&>*]:h-full [&+*]:mt-6 lg:[&+*]:mt-12;
+    @apply lg:-ml-16 -mt-6 lg:-mt-8 mb-0 lg:mb-4 aspect-square lg:aspect-[21/9] [&>*]:h-full [&+*]:mt-6 lg:[&+*]:mt-12;
   }
 
   &-summary {

data/app/permissions/decidim/budgets/permissions.rb

@@ -20,6 +20,10 @@ module Decidim
           can_vote?(true)
         when [:export_pdf, :order]
           can_export_pdf?
+        when [:destroy, :order]
+          can_destroy_order?
+        when [:read, :order]
+          can_read_order?
         end
 
         permission_action
@@ -44,9 +48,14 @@ module Decidim
       end
 
       def public_action_allowed?
-        return unless permission_action.subject == :project && permission_action.action == :read
+        return unless permission_action.action == :read
 
-        toggle_allow(project&.visible? && !project.deleted? && !project.budget.deleted?)
+        case permission_action.subject
+        when :project
+          toggle_allow(project.nil? || (project.visible? && !project.deleted? && !project.budget.deleted?))
+        when :budget
+          toggle_allow(budget.nil? || !budget.deleted?)
+        end
       end
 
       def can_vote?(active_allow)
@@ -70,6 +79,18 @@ module Decidim
 
         toggle_allow(is_allowed)
       end
+
+      def can_destroy_order?
+        is_allowed = user.present? &&
+                     order&.user == user &&
+                     current_settings&.votes == "enabled"
+
+        toggle_allow(is_allowed)
+      end
+
+      def can_read_order?
+        toggle_allow(user.present? && order&.user == user)
+      end
     end
   end
 end

data/config/locales/bg.yml

@@ -36,6 +36,7 @@ bg:
     budgets:
       actions:
         edit: Редактирай
+        edit_projects: Добави проекти
         import: Импортиране на предложения в проекти
         new_budget: Нов бюджет
         new_project: Нов проект
@@ -135,6 +136,7 @@ bg:
         cancel_order:
           more_than_one: да изтриете гласа си за %{name} и да започнете отначало
           only_one: изтрийте гласа си и започнете отначало.
+        completed: Приключен
         count:
           one: "%{count} бюджет"
           other: "%{count} бюджети"
@@ -179,6 +181,7 @@ bg:
           subject: Гласувахте в пространството за участие %{space_name}
           voted_on_space: Гласувахте за бюджета %{budget_name} за пространството за участие %{space_name}.
       projects:
+        back_to_budgets: Обратно към проектите
         budget_confirm:
           are_you_sure: Ако размислите, може да промените гласа си по-късно.
           cancel: Отказ
@@ -247,6 +250,7 @@ bg:
           added: Добавено
           all: Всички
         projects_for: Проекти за %{name}
+        select_projects: Добави проекти
         show:
           budget: Бюджет
       prompt: Изберете бюджет

data/config/locales/ca.yml

@@ -114,7 +114,7 @@ ca:
             title: Projectes eliminats
           new:
             create: Crear
-            title: Nova projecte a "%{budget}"
+            title: Nou projecte a %{budget}
           update:
             invalid: S'ha produït un error en actualitzar aquest projecte.
             success: Projecte actualitzat correctament.
@@ -368,7 +368,7 @@ ca:
             vote_rule_selected_projects_enabled: 'Activar regla: número mínim i màxim de projectes a votar'
             vote_rule_threshold_percent_enabled: 'Activar norma: percentatge mínim del pressupost'
             vote_selected_projects_maximum: Número màxim de projectes a seleccionar
-            vote_selected_projects_minimum: Número màxim de projectes a seleccionar
+            vote_selected_projects_minimum: Número mínim de projectes a seleccionar
             vote_threshold_percent: Percentatge del pressupost mínim per fer el vot
             voting_rule: Normes per a la votació
             voting_rule_choices:

data/config/locales/cs.yml

@@ -367,6 +367,7 @@ cs:
             announcement: Oznámení
             clear_all: Vymazat vše
             comments_enabled: Komentáře povoleny
+            comments_max_length: Maximální počet znaků na komentář (ponechte 0 pro výchozí hodnotu)
             define_taxonomy_filters: Před použitím tohoto nastavení prosím definujte některé filtry pro tento participační prostor.
             form:
               errors:

data/config/locales/de.yml

@@ -91,6 +91,7 @@ de:
             invalid: Beim Erstellen dieses Projekts ist ein Problem aufgetreten.
             success: Projekt erfolgreich erstellt.
           edit:
+            title: Projekt bei %{budget} bearbeiten
             update: Aktualisieren
           index:
             actions: Aktionen
@@ -113,6 +114,7 @@ de:
             title: Gelöschte Projekte
           new:
             create: Erstellen
+            title: Neues Projekt bei %{budget}
           update:
             invalid: Beim Aktualisieren dieses Projekts ist ein Problem aufgetreten.
             success: Projekt erfolgreich aktualisiert.
@@ -143,6 +145,8 @@ de:
             default_budget: Standardbudget
             no_components: Es gibt keine weiteren Vorschlagskomponenten in diesem partizipativen Raum, um die Vorschläge in Projekte zu importieren.
             origin_component_id: Ursprungskomponente
+            proposal_states: Vorschlagsstatus
+            proposal_states_help: Wählen Sie einen oder mehrere Vorschlagsstatus aus, die in Projekte importiert werden sollen. Wenn Sie keinen auswählen, werden alle veröffentlichten Vorschläge importiert, die noch nicht in andere Budgets dieser Komponente importiert wurden.
             select_component: Bitte wählen Sie eine Komponente aus
             title: Vorschläge bei Projekten importieren
         reminders:
@@ -343,6 +347,7 @@ de:
             announcement: Ankündigung
             clear_all: Alles löschen
             comments_enabled: Kommentare aktiviert
+            comments_max_length: Maximale Zeichenanzahl pro Kommentar (0 für Standardwert)
             define_taxonomy_filters: Bitte definieren Sie einige Filter für diesen partizipativen Bereich, bevor Sie diese Einstellung verwenden.
             form:
               errors:
@@ -415,7 +420,7 @@ de:
           id: Die eindeutige Bezeichnung des Projekts
           latitude: Der Breitengrad des Projekts, falls es einen verortet wurde
           longitude: Der Längengrad des Projekts, falls es verortet wurde
-          participatory_space: Zu welchem Bereich dieses Projekt gehört (z.B. Partizipationsprozesse oder Gremien)
+          participatory_space: Zu welchem Bereich dieses Projekt gehört (z.B. Partizipationsprozesse oder Versammlungen)
           reference: Die eindeutige Referenz des Projekts
           related_proposal_titles: Titel der verknüpften Vorschläge
           related_proposal_urls: URLs der verknüpften Vorschläge