decidim-participatory_processes 0.27.3 → 0.27.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c4da788d04485e5e8e76ad5f5feebfd09255a5cb75b23d051362b198cf794ea
-  data.tar.gz: 233a96b9a51aa841f5d06b316080ff7c19144ffd5675bc67d7ab32f41f5d7102
+  metadata.gz: f5da5397322d7ac8571266ff03b849524938adfa7eb8295070ab0edf6d722a68
+  data.tar.gz: 7ce3bff70e9931a674a8359a07c669334acf8273227d844f9daded65b926be65
 SHA512:
-  metadata.gz: 88dd80d979edf4bdeb741b266df3fa8e5ca5abcac39b15a464690289dbaa2e93c2e1a7e70892ee4f11b78be111642c2ec87a108a8934fe2fc3b38e39ef8b1110
-  data.tar.gz: 01ae22ed7c6ed37a7dcb7c379f2f31db2833dca2882ae5a51caaf418295a7ba7fec1f06749c2607b58a11614e43e38eb348cc091314f928d62e8c9e331be421e
+  metadata.gz: 3c9287731a0bd54fb35596cadcc536d045c705c9c8205a541758ac4af1f7c58f303c83226822ea6c880320a24479a828e8e0504b59926b3f06de3a2c00f59fc5
+  data.tar.gz: f4de5d3b7a4c3c4dd4b5fecc638e05e2d9ad84297f647fae4c68c45b0923d4a0830777af349301304f93a83d91a9a2782a7d49c76d4c8bb1c512bc9380edbd3b

data/app/cells/decidim/participatory_process_groups/content_blocks/highlighted_participatory_processes/filters.erb

@@ -3,7 +3,7 @@
     <%= cell(
       "decidim/scopes_picker",
       form,
-      attribute: :with_scope,
+      attribute: :with_any_scope,
       multiple: true,
       legend_title: I18n.t("decidim.scopes.scopes"),
       label: false,

data/app/cells/decidim/participatory_process_groups/content_blocks/highlighted_participatory_processes_cell.rb

@@ -42,7 +42,7 @@ module Decidim
 
         def default_filter_params
           {
-            with_scope: nil,
+            with_any_scope: nil,
             with_area: nil,
             with_type: nil
           }

data/app/cells/decidim/participatory_process_groups/process_filters_cell.rb

@@ -56,7 +56,7 @@ module Decidim
         query = base_relation.ransack(
           {
             with_date: date_filter,
-            with_scope: get_filter(:with_scope),
+            with_any_scope: get_filter(:with_any_scope),
             with_area: get_filter(:with_area),
             with_type: filter_with_type ? get_filter(:with_type) : nil
           },

data/app/cells/decidim/participatory_processes/process_filters_cell.rb

@@ -34,7 +34,7 @@ module Decidim
         {
           filter: {
             with_date: date_filter,
-            with_scope: get_filter(:with_scope),
+            with_any_scope: get_filter(:with_any_scope),
             with_area: get_filter(:with_area),
             with_type: type_filter || get_filter(:with_type)
           }
@@ -45,7 +45,7 @@ module Decidim
         query = ParticipatoryProcess.where(organization: current_organization).ransack(
           {
             with_date: date_filter,
-            with_scope: get_filter(:with_scope),
+            with_any_scope: get_filter(:with_any_scope),
             with_area: get_filter(:with_area),
             with_type: filter_with_type ? get_filter(:with_type) : nil
           },

data/app/commands/decidim/participatory_processes/admin/destroy_participatory_process_admin.rb

@@ -23,6 +23,7 @@ module Decidim
         # Returns nothing.
         def call
           destroy_role!
+          dispatch_system_event
           broadcast(:ok)
         end
 
@@ -30,6 +31,10 @@ module Decidim
 
         attr_reader :role, :current_user
 
+        def dispatch_system_event
+          ActiveSupport::Notifications.publish("decidim.system.participatory_space.admin.destroyed", role.class.name, role.id)
+        end
+
         def destroy_role!
           extra_info = {
             resource: {

data/app/controllers/decidim/participatory_processes/admin/participatory_process_groups_controller.rb

@@ -81,12 +81,11 @@ module Decidim
         private
 
         def participatory_process_group
-          @participatory_process_group ||= Decidim::ParticipatoryProcessGroup.find(params[:id])
+          @participatory_process_group ||= collection.find(params[:id])
         end
 
         def collection
-          @collection ||=
-            OrganizationParticipatoryProcessGroups.new(current_user.organization).query
+          @collection ||= OrganizationParticipatoryProcessGroups.new(current_user.organization).query
         end
       end
     end

data/app/controllers/decidim/participatory_processes/admin/participatory_process_types_controller.rb

@@ -86,7 +86,7 @@ module Decidim
         end
 
         def current_participatory_process_type
-          @current_participatory_process_type ||= Decidim::ParticipatoryProcessType.find(params[:id])
+          @current_participatory_process_type ||= collection.find(params[:id])
         end
 
         def collection

data/app/controllers/decidim/participatory_processes/admin/participatory_processes_controller.rb

@@ -77,7 +77,7 @@ module Decidim
         private
 
         def process_group
-          @process_group ||= ParticipatoryProcessGroup.find_by(id: ransack_params[:decidim_participatory_process_group_id_eq])
+          @process_group ||= ParticipatoryProcessGroup.find_by(id: ransack_params[:decidim_participatory_process_group_id_eq], organization: current_organization)
         end
 
         def collection

data/app/controllers/decidim/participatory_processes/participatory_processes_controller.rb

@@ -46,7 +46,7 @@ module Decidim
 
       def default_filter_params
         {
-          with_scope: nil,
+          with_any_scope: nil,
           with_area: nil,
           with_type: nil,
           with_date: default_date_filter

data/app/models/decidim/participatory_process.rb

@@ -207,7 +207,7 @@ module Decidim
     ransacker_i18n :title
 
     def self.ransackable_scopes(_auth_object = nil)
-      [:with_date, :with_area, :with_scope, :with_type]
+      [:with_date, :with_area, :with_any_scope, :with_type]
     end
   end
 end

data/app/queries/decidim/participatory_processes/filtered_participatory_process_groups.rb

@@ -15,9 +15,11 @@ module Decidim
 
         processes = case @filter
                     when "past"
-                      processes.where("decidim_participatory_processes.end_date <= ?", Date.current)
+                      processes.past
                     when "upcoming"
-                      processes.where("decidim_participatory_processes.start_date > ?", Date.current)
+                      processes.upcoming
+                    when "active"
+                      processes.active
                     else
                       processes
                     end

data/app/queries/decidim/participatory_processes/stats_participants_count.rb

@@ -42,6 +42,8 @@ module Decidim
       end
 
       def comments_query
+        return [] unless Decidim.module_installed?(:comments)
+
         Decidim::Comments::Comment
           .where(decidim_participatory_space_type: Decidim::ParticipatoryProcess.class.name)
           .where(decidim_participatory_space_id: participatory_space_ids)
@@ -50,6 +52,8 @@ module Decidim
       end
 
       def debates_query
+        return [] unless Decidim.module_installed?(:debates)
+
         Decidim::Debates::Debate
           .where(
             component: space_components,
@@ -61,6 +65,8 @@ module Decidim
       end
 
       def meetings_query
+        return [] unless Decidim.module_installed?(:meetings)
+
         meetings = Decidim::Meetings::Meeting.where(component: space_components).not_hidden
         registrations = Decidim::Meetings::Registration.where(decidim_meeting_id: meetings).distinct.pluck(:decidim_user_id)
         organizers = meetings.where(decidim_author_type: Decidim::UserBaseEntity.name).distinct.pluck(:decidim_author_id)
@@ -76,6 +82,8 @@ module Decidim
       end
 
       def proposals_query
+        return [] unless Decidim.module_installed?(:proposals)
+
         Decidim::Coauthorship
           .where(
             coauthorable: proposals_components,
@@ -86,6 +94,8 @@ module Decidim
       end
 
       def proposal_supports_query
+        return [] unless Decidim.module_installed?(:proposals)
+
         Decidim::Proposals::ProposalVote
           .where(
             proposal: proposals_components
@@ -96,6 +106,8 @@ module Decidim
       end
 
       def project_supports_query
+        return [] unless Decidim.module_installed?(:budgets)
+
         Decidim::Budgets::Order.joins(budget: [:component])
                                .where(budget: {
                                         decidim_components: { id: space_components.pluck(:id) }

data/app/views/decidim/participatory_processes/admin/participatory_process_copies/new.html.erb

@@ -1,5 +1,4 @@
-<% add_decidim_page_title(t("participatory_process_copies.new.select", scope: "decidim.admin")) %>
-
+<% add_decidim_page_title(t("participatory_process_copies.new.title", scope: "decidim.admin")) %>
 <%= decidim_form_for(@form, url: participatory_process_copies_path(current_participatory_process), method: :post, html: { class: "form copy_participatory_process" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t("participatory_process_copies.new.title", scope: "decidim.admin"), select: t("participatory_process_copies.new.select", scope: "decidim.admin") } %>
 

data/app/views/decidim/participatory_processes/admin/participatory_process_groups/edit.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title t("participatory_process_groups.edit.title", scope: "decidim.admin") %>
 <%= decidim_form_for(@form, html: { class: "form edit_participatory_process_group" }) do |f| %>
   <h2 class="process-title-summary">
     <%= t "participatory_process_groups.edit.title", scope: "decidim.admin" %>

data/app/views/decidim/participatory_processes/admin/participatory_process_groups/index.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t("decidim.admin.titles.participatory_process_groups")) %>
 <% content_for :sidebar_menu_nav do %>
   <%= sidebar_menu(:admin_participatory_processes_menu).render %>
 <% end %>

data/app/views/decidim/participatory_processes/admin/participatory_process_groups/new.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t("participatory_process_groups.new.title", scope: "decidim.admin")) %>
 <%= decidim_form_for(@form, html: { class: "form new_participatory_process_group" }) do |f| %>
   <h2 class="process-title-summary"><%= t "participatory_process_groups.new.title", scope: "decidim.admin" %></h2>
   <%= render partial: "form", object: f %>

data/app/views/decidim/participatory_processes/admin/participatory_process_types/edit.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title t("participatory_process_types.edit.title", scope: "decidim.admin") %>
 <%= decidim_form_for(@form, html: { class: "form edit_participatory_process_type" }) do |f| %>
   <h2 class="process-title-summary">
     <%= t("participatory_process_types.edit.title", scope: "decidim.admin") %>

data/app/views/decidim/participatory_processes/admin/participatory_process_types/index.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t("titles.participatory_process_types", scope: "decidim.admin")) %>
 <div class="card" id="participatory-process-types">
   <div class="card-divider">
     <h2 class="card-title">

data/app/views/decidim/participatory_processes/admin/participatory_process_types/new.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t("participatory_process_types.new.title", scope: "decidim.admin")) %>
 <%= decidim_form_for(@form, html: { class: "form new_participatory_process_type" }) do |f| %>
   <h2 class="process-title-summary">
     <%= t("participatory_process_types.new.title", scope: "decidim.admin") %>

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

@@ -1,5 +1,4 @@
 <% add_decidim_page_title(t("participatory_processes", scope: "decidim.admin.titles")) %>
-
 <% content_for :sidebar_menu_nav do %>
   <%= sidebar_menu(:admin_participatory_processes_menu).render %>
 <% end %>

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

@@ -1,5 +1,4 @@
 <% add_decidim_page_title(t("participatory_processes.new.title", scope: "decidim.admin")) %>
-
 <h2 class="process-title-summary">
   <%= t "participatory_processes.new.title", scope: "decidim.admin" %>
 </h2>

data/app/views/decidim/participatory_processes/participatory_process_steps/index.html.erb

@@ -1,5 +1,4 @@
 <% add_decidim_page_title(t("participatory_process_steps.index.title", scope: "decidim")) %>
-
 <div class="steps">
   <div class="row column">
     <div class="row">

data/config/environment.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+# Empty line for playing nice with tpope/vim-rails

data/config/locales/ar.yml

@@ -106,7 +106,6 @@ ar:
           attachments: مرفقات
           categories: الاقسام
           components: المكونات
-          info: معلومات
           moderations: الإعتدال
           private_users: المشاركون من القطاع الخاص
           process_admins: مدراء العملية
@@ -147,6 +146,9 @@ ar:
           copy: نسخ
           select: حدد البيانات التي ترغب في تكرارها
           title: عملية تشاركية مكررة
+      participatory_process_group_landing_page_content_blocks:
+        edit:
+          update: تحديث
       participatory_process_groups:
         destroy:
           success: تم حذف مجموعة العملية التشاركية بنجاح.
@@ -197,6 +199,9 @@ ar:
         update:
           error: حدثت مشكلة أثناء تحديث هذه المرحلة من العملية التشاركية.
           success: تم تحديث المرحلة التشاركية بنجاح.
+      participatory_process_types:
+        form:
+          title: عنوان
       participatory_process_user_roles:
         create:
           error: حدثت مشكلة أثناء إضافة مشارك لهذه العملية التشاركية.
@@ -288,6 +293,9 @@ ar:
       content_blocks:
         metadata:
           name: البيانات الوصفية
+          participatory_scope: ما الذي تقرر
+          participatory_structure: كيف تقرر ذلك
+          target: من يشارك
         stats:
           name: نشاط
       show:
@@ -301,15 +309,14 @@ ar:
         content_blocks:
           highlighted_processes:
             max_results: أقصى قدر من العناصر لإظهارها
-        participatory_process_copies:
+        participatory_process_groups:
           form:
-            slug_help: 'يتم استخدام slugs URL لإنشاء عناوين URL التي تشير إلى هذه العملية. يقبل الحروف والأرقام والشرطات فقط ، ويجب أن يبدأ بحرف. مثال: %{url}'
+            title: معلومات عامة
         participatory_process_imports:
           form:
             document_legend: إضافة وثيقة
         participatory_process_steps:
           form:
-            cta_path_help: 'استخدم المسارات الجزئية ، وليس عناوين URL الكاملة هنا. يقبل الحروف والأرقام والشرطات والمائلة ، ويجب أن يبدأ بحرف. إذا لم يتم تعيينه ، فلن يظهر الزر. مثال: %{url}'
             cta_text_help: إذا لم يتم تعيينه ، فلن يظهر الزر.
         participatory_processes:
           form:
@@ -322,7 +329,6 @@ ar:
             related_processes: العمليات ذات الصلة
             select_an_area: اختر منطقة
             select_process_group: حدد مجموعة عملية
-            slug_help: 'يتم استخدام slugs URL لإنشاء عناوين URL التي تشير إلى هذه العملية. يقبل الحروف والأرقام والشرطات فقط ، ويجب أن يبدأ بحرف. مثال: %{url}'
             title: معلومات عامة
             visbility: رؤية
       content_blocks:
@@ -335,11 +341,9 @@ ar:
       pages:
         home:
           highlighted_processes:
-            active_processes: عمليات نشطة
             active_step: المرحلة النشطة
             more_information: معلومات اكثر
             participate: مشاركة
-            see_all_processes: رؤية جميع العمليات
       participatory_processes:
         filters:
           counters:
@@ -387,7 +391,6 @@ ar:
         area: منطقة
         developer_group: مجموعة المروجين
         end_date: تاريخ الانتهاء
-        local_area: منطقة التنظيم
         participatory_scope: ما الذي تقرر
         participatory_structure: كيف تقرر ذلك
         private_space: هذه عملية خاصة
@@ -417,8 +420,10 @@ ar:
           active_step: 'المرحلة الحالية:'
           more_info: مزيد من المعلومات
           take_part: خذ جزء
+        promoted_process_group:
+          more_info: مزيد من المعلومات
       process_header_steps:
         step: المرحلة %{current} من %{total}
-        view_steps: عرض المراحل
+        view_steps: مراحل العملية
       process_navigation:
         process_menu_item: المسار

data/config/locales/bg.yml

@@ -18,3 +18,9 @@ bg:
         hero_image: Изображение за начална страница
         local_area: Район на организацията
         meta_scope: Метаданни сфера
+  decidim:
+    participatory_processes:
+      show:
+        area: Район
+        developer_group: Група за популяризиране
+        end_date: Крайна дата

data/config/locales/ca.yml

@@ -180,7 +180,7 @@ ca:
           inactive_content_blocks: Blocs de contingut inactius
       participatory_process_group_landing_page_content_blocks:
         edit:
-          update: Actualitzar
+          update: Actualitza
       participatory_process_groups:
         destroy:
           error: Hi ha hagut un error eliminant aquest grup de processos participatius.
@@ -376,9 +376,9 @@ ca:
         metadata:
           developer_group: Promogut per
           name: Metadades
-          participatory_scope: Què es decideix
+          participatory_scope: El que es decideix
           participatory_structure: Com es decideix
-          target: Qui participa
+          target: Qui hi participa
         participatory_processes:
           name: Processos participatius
         stats:
@@ -405,7 +405,7 @@ ca:
             json: JSON
         participatory_process_copies:
           form:
-            slug_help: 'Els noms curts d''URL s''utilitzen per generar els URL que apunten a aquest procés. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
+            slug_help: 'Els noms curts d''URL s''utilitzen per generar les URL que apunten a aquest procés. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
         participatory_process_groups:
           form:
             metadata: Metadades
@@ -432,7 +432,7 @@ ca:
             select_an_area: Selecciona una àrea
             select_participatory_process_type: Selecciona un tipus de procés
             select_process_group: Selecciona un grup de processos
-            slug_help: 'Els noms curts d''URL s''utilitzen per generar els URL que apunten a aquest procés. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
+            slug_help: 'Els noms curts d''URL s''utilitzen per generar les URL que apunten a aquest procés. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
             title: Informació general
             visbility: Visibilitat
       content_blocks:
@@ -493,13 +493,13 @@ ca:
         developer_group: Grup promotor
         end_date: Data de finalització
         local_area: Àrea d'organització
-        participatory_scope: Què es decideix
+        participatory_scope: El que es decideix
         participatory_structure: Com es decideix
         private_space: Aquest és un procés privat
         related_processes: Processos relacionats
         scope: Àmbit
         start_date: Data d'inici
-        target: Qui participa
+        target: Qui hi participa
         unspecified: Sense especificar
     statistics:
       processes_count: Processos
@@ -533,6 +533,6 @@ ca:
           more_info: Més informació
       process_header_steps:
         step: Fase %{current} de %{total}
-        view_steps: Veure les fases
+        view_steps: Fases del procés
       process_navigation:
         process_menu_item: El procés

data/config/locales/cs.yml

@@ -186,7 +186,7 @@ cs:
           inactive_content_blocks: Neaktivní bloky obsahu
       participatory_process_group_landing_page_content_blocks:
         edit:
-          update: Aktualizovat
+          update: Aktualizace
       participatory_process_groups:
         destroy:
           error: Došlo k chybě při zrušení skupiny účastnických procesů.
@@ -252,7 +252,7 @@ cs:
           title: Upravit typ procesu
           update: Aktualizovat
         form:
-          title: Název
+          title: Titul
         new:
           create: Vytvořit
           title: Nový typ procesu
@@ -382,8 +382,8 @@ cs:
         metadata:
           developer_group: Propagováno
           name: Metadata
-          participatory_scope: O čem se rozhoduje
-          participatory_structure: Jak se o tom rozhoduje
+          participatory_scope: Co se rozhodlo
+          participatory_structure: Jak se to rozhoduje
           target: Kdo se účastní
         participatory_processes:
           name: Participativní procesy
@@ -413,19 +413,19 @@ cs:
             json: JSON
         participatory_process_copies:
           form:
-            slug_help: 'Sloupce adres URL se používají k vygenerování adres URL, které směřují k tomuto procesu. Přijme pouze písmena, čísla a pomlčky a musí začínat písmenem. Příklad: %{url}'
+            slug_help: 'URL slugy slouží ke generaci adres URL, které odkazují na tento proces. Povolená jsou pouze písmena, číslice a pomlčky a musí začínat písmenem. Příklad: %{url}'
         participatory_process_groups:
           form:
             metadata: Metadata
-            title: Obecné informace
+            title: Obecná informace
             visibility: Viditelnost
         participatory_process_imports:
           form:
             document_legend: Přidat dokument
-            slug_help: 'URL slug se používají k vygenerování adres URL, které odkazují na toto shromáždění. Přijme pouze písmena, čísla a pomlčky a musí začínat písmenem. Příklad: %{url}'
+            slug_help: 'URL slugy slouží ke generaci adres URL, které odkazují na tento proces. Povolená jsou pouze písmena, číslice a pomlčky a musí začínat písmenem. Příklad: %{url}'
         participatory_process_steps:
           form:
-            cta_path_help: 'Použijte zde částečné cesty, ne úplné adresy URL. Přijme písmena, čísla, pomlčky a lomítka a musí začínat písmenem. Není-li nastaveno, tlačítko se nezobrazí. Příklad: %{url}'
+            cta_path_help: 'Zde použijte částečné cesty, nikoli úplné adresy URL. Jsou povolena písmena, čísla, pomlčky a lomítka a musí začínat písmenem. Příklad: %{url}'
             cta_text_help: Není-li nastaveno, tlačítko se nezobrazí.
         participatory_processes:
           form:
@@ -440,7 +440,7 @@ cs:
             select_an_area: Vyberte oblast
             select_participatory_process_type: Vyberte typ procesu
             select_process_group: Vyberte skupinu procesů
-            slug_help: 'Sloupce adres URL se používají k vygenerování adres URL, které směřují k tomuto procesu. Přijme pouze písmena, čísla a pomlčky a musí začínat písmenem. Příklad: %{url}'
+            slug_help: 'URL slugy slouží ke generaci adres URL, které odkazují na tento proces. Povolená jsou pouze písmena, číslice a pomlčky a musí začínat písmenem. Příklad: %{url}'
             title: Obecná informace
             visbility: Viditelnost
       content_blocks:
@@ -508,7 +508,7 @@ cs:
         dates: Data
         developer_group: Skupina promotérů
         end_date: Datum ukončení
-        local_area: Oblast působnosti organizace
+        local_area: Oblast organizace
         participatory_scope: Co se rozhodlo
         participatory_structure: Jak se to rozhoduje
         private_space: Jedná se o soukromý proces
@@ -549,6 +549,6 @@ cs:
           more_info: Více informací
       process_header_steps:
         step: Krok %{current} z %{total}
-        view_steps: Zobrazit kroky
+        view_steps: Procesní kroky
       process_navigation:
         process_menu_item: Proces