decidim-participatory_processes 0.26.0.rc1 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f987a0428cc521c80f64cb0ea33c846e3554306a6627087a16f8fd752ab14f08
-  data.tar.gz: 6c97963c46683bf0cecd57f1708156bf841e52fba63f45085eb63c33a197ee91
+  metadata.gz: 22cc1282cd81180e263805209b5b2f9a18c2a43b2b9347e168b2dc8b08841fa4
+  data.tar.gz: cc514a0170cee7812314d2169df78714a0f7276831e33c52b7355f3f5cefc196
 SHA512:
-  metadata.gz: 9048bbb753317c874e711d4067917eaf674127a22a639815b811e3d304833af3dfb3b0361569258166040bb59ca90431ee62baddfe6b0e8e72067089ea8303a7
-  data.tar.gz: 3a66e14a2b0170cfe99bd8207b668d859405d83032c8c89375f080685d73b2ab96561987bd6a1e3e9f7fbf3418c80e60ea164713cd1cc9b74d4c006f18873501
+  metadata.gz: 974bfce15fd116417f1e96eca713ce008b06a0cf97b169564f9b26f211f1c4dee697c55e324d3a6de87deb0b48d51b7db5ba5c9cc2ba06bbe5aa4694938b3655
+  data.tar.gz: d655ff176321f1c4b24f56df35e98fa27a7efb265a0077ed3f992ab39e0c0ea89243e496ac68bbc3564449a7e31a484cce1adab5ba5c24d49f3a4745a904505a

data/app/cells/decidim/participatory_process_groups/content_blocks/title/show.erb

@@ -23,7 +23,7 @@
           <%= icon "twitter", role: "img", aria_label: "Twitter", class: "mr-xs" %>
           <%= link_to(
             "##{hashtag_text}",
-            "https://twitter.com/hashtag/#{hashtag_text}",
+            twitter_hashtag_url(hashtag_text),
             target: "_blank"
           ) %>
         </div>

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

@@ -6,6 +6,7 @@ module Decidim
       class TitleCell < Decidim::ViewModel
         include Decidim::SanitizeHelper
         include Decidim::IconHelper
+        include Decidim::TwitterSearchHelper
 
         delegate :group_url, to: :participatory_process_group
 

data/app/cells/decidim/participatory_processes/process_m/tags.erb

@@ -1,7 +1,7 @@
 <% if model.hashtag.present? %>
   <%= link_to(
     "##{decidim_html_escape(model.hashtag)}",
-    "https://twitter.com/hashtag/#{decidim_html_escape(model.hashtag)}",
+    twitter_hashtag_url(decidim_html_escape(model.hashtag)),
     class: "card__text--category",
     target: "_blank"
    ) %>

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

@@ -7,6 +7,7 @@ module Decidim
     class ProcessMCell < Decidim::CardMCell
       include Decidim::SanitizeHelper
       include Decidim::TranslationsHelper
+      include Decidim::TwitterSearchHelper
 
       private
 

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

@@ -88,7 +88,10 @@ module Decidim
             meta_scope: form.meta_scope,
             start_date: form.start_date,
             end_date: form.end_date,
-            participatory_process_group: form.participatory_process_group
+            participatory_process_group: form.participatory_process_group,
+            show_metrics: form.show_metrics,
+            show_statistics: form.show_statistics,
+            announcement: form.announcement
           }
         end
 

data/app/permissions/decidim/participatory_processes/permissions.rb

@@ -19,7 +19,6 @@ module Decidim
           public_list_process_groups_action?
           public_read_process_group_action?
           public_read_process_action?
-          public_report_content_action?
           return permission_action
         end
 
@@ -119,13 +118,6 @@ module Decidim
         user.admin || process.users.include?(user)
       end
 
-      def public_report_content_action?
-        return unless permission_action.action == :create &&
-                      permission_action.subject == :moderation
-
-        allow!
-      end
-
       # Only organization admins can enter the process groups space area.
       def user_can_enter_process_groups_space_area?
         return unless permission_action.action == :enter &&

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

@@ -9,7 +9,7 @@ module Decidim
       end
 
       def query
-        Decidim::ParticipatoryProcess.where(participatory_process_group: @group)
+        Decidim::ParticipatoryProcess.where(participatory_process_group: @group).order(weight: :asc)
       end
     end
   end

data/app/views/decidim/participatory_process_steps/_participatory_process_step.html.erb

@@ -7,7 +7,7 @@
       <span class="timeline__date text-small">
         <%= participatory_space_helpers.step_dates(participatory_process_step) %>
       </span>
-      <h4 class="timeline__title heading4"><%= translated_attribute(participatory_process_step.title) %></h4>
+      <h3 class="timeline__title heading4"><%= translated_attribute(participatory_process_step.title) %></h3>
     </div>
     <div class="timeline__content">
       <%= translated_attribute(participatory_process_step.description).html_safe %>

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

@@ -10,7 +10,7 @@
             <%= t(".back_to_process") %>
           <% end %>
 
-          <h3 class="section-heading"><%= t("participatory_process_steps.index.process_steps", scope: "decidim") %></h3>
+          <h2 class="section-heading"><%= t("participatory_process_steps.index.process_steps", scope: "decidim") %></h2>
           <%= render partial: "timeline" %>
         </div>
       </div>

data/app/views/decidim/participatory_processes/participatory_processes/_promoted_process_group.html.erb

@@ -4,7 +4,7 @@
     <div class="columns mediumlarge-8 large-6 card--process__column">
       <div class="card__content">
         <%= link_to participatory_process_group_path(promoted_process_group), class: "card__link" do %>
-          <h2 class="card__title"><%= decidim_html_escape(translated_attribute(promoted_process_group.title)) %></h2>
+          <h2 class="card__title"><%= decidim_html_escape(translated_attribute(promoted_process_group.title)).html_safe %></h2>
         <% end %>
         <%= decidim_sanitize_editor html_truncate(translated_attribute(promoted_process_group.description), length: 630, separator: "...") %>
         <%= link_to participatory_process_group_path(promoted_process_group), class: "button small hollow card__button" do %>

data/app/views/decidim/participatory_processes/participatory_processes/show.html.erb

@@ -27,6 +27,7 @@
   <div class="row">
     <div class="columns medium-7 mediumlarge-8">
       <div class="section">
+        <h2 class="show-for-sr"><%= t(".title") %></h2>
         <% if participatory_process_group.present? %>
           <%= render partial: "participatory_process_group" %>
         <% end %>

data/app/views/layouts/decidim/_process_header.html.erb

@@ -11,14 +11,14 @@
           </h1>
         </div>
         <div>
-          <h2 class="text-highlight heading-small">
+          <p class="text-highlight heading-small">
             <% if current_participatory_space.hashtag.present? %>
               <span class="process-header__hashtag">
-                <%= link_to "##{decidim_html_escape(current_participatory_space.hashtag)}", "https://twitter.com/hashtag/#{decidim_html_escape(current_participatory_space.hashtag)}", target: "_blank" %>
+                <%= link_to "##{decidim_html_escape(current_participatory_space.hashtag)}", twitter_hashtag_url(decidim_html_escape(current_participatory_space.hashtag)), target: "_blank" %>
               </span>
             <% end %>
             <%= translated_attribute(current_participatory_space.subtitle) %>
-          </h2>
+          </p>
         </div>
       </div>
       <%= render partial: "layouts/decidim/process_header_steps", locals: { participatory_process: current_participatory_space } %>

data/config/locales/cs.yml

@@ -451,6 +451,8 @@ cs:
           see: Vidět
         index:
           loading: Načítání výsledků...
+        show:
+          title: O tomto procesu
       show:
         area: Oblast
         belongs_to_group: Tento proces patří do

data/config/locales/de.yml

@@ -435,6 +435,8 @@ de:
           see: Sehen
         index:
           loading: Ergebnisse werden geladen ...
+        show:
+          title: Über diesen Prozess
       show:
         area: Bereich
         belongs_to_group: Dieser Prozess gehört zu
@@ -443,7 +445,7 @@ de:
         end_date: Enddatum
         local_area: Organisationsbereich
         participatory_scope: Was wird entschieden?
-        participatory_structure: Wie ist es entschieden?
+        participatory_structure: Wie wird es entschieden
         private_space: Dies ist ein privater Prozess
         related_processes: Ähnliche Beteiligungsprozesse
         scope: Umfang

data/config/locales/en.yml

@@ -436,6 +436,8 @@ en:
           see: See
         index:
           loading: Loading results...
+        show:
+          title: About this process
       show:
         area: Area
         belongs_to_group: This process belongs to

data/config/locales/fi-plain.yml

@@ -435,6 +435,8 @@ fi-pl:
           see: Katso
         index:
           loading: Ladataan tulokset...
+        show:
+          title: Tietoa tästä prosessista
       show:
         area: Alue
         belongs_to_group: Tämä prosessi kuuluu ryhmään

data/config/locales/fi.yml

@@ -435,6 +435,8 @@ fi:
           see: Näytä
         index:
           loading: Ladataan tulokset...
+        show:
+          title: Tietoa tästä prosessista
       show:
         area: Alue
         belongs_to_group: Tämä prosessi kuuluu ryhmään

data/config/locales/fr-CA.yml

@@ -34,6 +34,7 @@ fr-CA:
         subtitle: Sous-titre
         target: Participants
         title: Titre
+        weight: Rang d'affichage
       participatory_process_group:
         description: Description
         developer_group: Groupe d'initiateurs
@@ -434,6 +435,8 @@ fr-CA:
           see: Voir
         index:
           loading: Chargement des résultats...
+        show:
+          title: A propos de cette concertation
       show:
         area: Périmètre d'assemblée
         belongs_to_group: Cette concertation appartient à
@@ -449,6 +452,8 @@ fr-CA:
         start_date: Date de début
         target: Participants
         unspecified: Non précisé
+    statistics:
+      processes_count: Concertations
   layouts:
     decidim:
       participatory_process_groups:

data/config/locales/fr.yml

@@ -20,7 +20,7 @@ fr:
         participatory_process_group_id: Groupe de processus
         participatory_scope: Objectifs
         participatory_structure: Modalités de décision
-        promoted: Mise en avant
+        promoted: Mis en avant
         published_at: Publiée à
         related_process_ids: Concertations liées
         scope_id: Périmètre d'application
@@ -34,6 +34,7 @@ fr:
         subtitle: Sous-titre
         target: Participants
         title: Titre
+        weight: Rang d'affichage
       participatory_process_group:
         description: Description
         developer_group: Groupe d'initiateurs
@@ -122,7 +123,7 @@ fr:
           fields:
             created_at: Créée le
             private: Privée
-            promoted: Mise en avant
+            promoted: Mettre en avant
             published: Publiée
             title: Titre
           name: Concertation
@@ -327,7 +328,7 @@ fr:
         html_3:
           name: Bloc HTML 3
         metadata:
-          developer_group: Mis en avant par
+          developer_group: Organisateur
           name: Métadonnées
           participatory_scope: Objectifs
           participatory_structure: Modalités de décision
@@ -402,7 +403,7 @@ fr:
             more_information: Plus d'informations
             participate: Participer
             participate_in: Participer au processus %{resource_name}
-            processes_button_title: Lien vers la page Concertation où toutes les concertations sont affichées
+            processes_button_title: Lien vers la page des concertations où toutes les concertations sont affichées
             see_all_processes: Voir toutes les concertations
       participatory_process_steps:
         index:
@@ -434,6 +435,8 @@ fr:
           see: Voir
         index:
           loading: Chargement des résultats...
+        show:
+          title: A propos de cette concertation
       show:
         area: Périmètre d'assemblée
         belongs_to_group: Cette concertation appartient à
@@ -449,6 +452,8 @@ fr:
         start_date: Date de début
         target: Participants
         unspecified: Non précisé
+    statistics:
+      processes_count: Concertations
   layouts:
     decidim:
       participatory_process_groups:

data/config/locales/gl.yml

@@ -415,6 +415,8 @@ gl:
           see: Ver
         index:
           loading: Cargando resultados ...
+        show:
+          title: Sobre este proceso
       show:
         area: Área
         belongs_to_group: Este proceso pertence a

data/config/locales/it.yml

@@ -435,6 +435,8 @@ it:
           see: Vedi tutto
         index:
           loading: Caricamento risultati...
+        show:
+          title: Informazioni su questo processo
       show:
         area: Area
         belongs_to_group: Questo processo appartiene a

data/config/locales/ja.yml

@@ -119,7 +119,7 @@ ja:
         participatory_process:
           fields:
             created_at: 作成日時
-            private: 非公開
+            private: プライベート
             promoted: 強調表示
             published: 公開済み
             title: タイトル
@@ -241,7 +241,7 @@ ja:
           update: 更新
         index:
           not_published: 未公開
-          private: 非公開
+          private: プライベート
           public: 公開
           published: 公開済み
         new:
@@ -260,7 +260,7 @@ ja:
           success: 参加型プロセスグループを作成しました。
       titles:
         participatory_process_groups: 参加型プロセスグループ
-        participatory_processes: 参加型するプロセス
+        participatory_processes: 参加型プロセス
       users:
         resend_invitation:
           error: 招待状の再送信中に問題が発生しました。
@@ -315,7 +315,7 @@ ja:
         title: 参加型プロセス
     participatory_process:
       show:
-        related_assemblies: 関連する参加スペース
+        related_assemblies: 関連する参加型スペース
     participatory_process_groups:
       content_blocks:
         html_1:
@@ -427,6 +427,8 @@ ja:
           see: 見る
         index:
           loading: 結果を読み込み中...
+        show:
+          title: このプロセスについて
       show:
         area: エリア
         belongs_to_group: このプロセスの所属グループ

data/config/locales/no.yml

@@ -16,7 +16,7 @@
         hashtag: Emneknagg
         hero_image: Hovedbilde
         local_area: Organisasjonsområde
-        meta_scope: Tema metadata
+        meta_scope: Omfang av metadata
         participatory_process_group_id: Prosessgruppe
         participatory_scope: Medvirkningen gjelder
         participatory_structure: Hvordan det blir gjort
@@ -34,10 +34,20 @@
         subtitle: Undertittel
         target: Hvem som deltar
         title: Tittel
+        weight: Prioritert rekkefølge
       participatory_process_group:
         description: Beskrivelse
+        developer_group: Promotørgruppe
+        group_url: Nettside
+        hashtag: Emneknagg
         hero_image: Bilde
+        local_area: Organisasjonsområde
+        meta_scope: Tema metadata
         participatory_process_ids: Relaterte prosesser
+        participatory_scope: Medvirkningen gjelder
+        participatory_structure: Hvordan blir det gjort
+        target: Hvem medvirker
+        title: Tittel
       participatory_process_step:
         cta_path: Annonseringsknapp
         cta_text: Annonseringstekst
@@ -93,6 +103,9 @@
         unpublish: Avpubliser
       menu:
         participatory_process_groups: Prosessgrupper
+        participatory_process_groups_submenu:
+          info: Informasjon
+          landing_page: Startsiden
         participatory_processes: Prosesser
         participatory_processes_submenu:
           attachment_collections: Mapper
@@ -115,6 +128,8 @@
             title: Tittel
           name: Deltakende prosess
         participatory_process_group:
+          fields:
+            title: Tittel
           name: Prosessgruppe
         participatory_process_step:
           fields:
@@ -142,6 +157,13 @@
           copy: Kopier
           select: Velg hvilke data du vil kopiere
           title: Kopier deltakende prosess
+      participatory_process_group_landing_page:
+        edit:
+          active_content_blocks: Aktive innholdsbokser
+          inactive_content_blocks: Inaktive innholdsbokser
+      participatory_process_group_landing_page_content_blocks:
+        edit:
+          update: Oppdater
       participatory_process_groups:
         destroy:
           error: Det oppstod en feil under slettingen av prosessgruppen.
@@ -299,8 +321,28 @@
         related_assemblies: Relaterte forsamlinger
     participatory_process_groups:
       content_blocks:
+        html_1:
+          name: Første HTML-blokk
+        html_2:
+          name: Andre HTML-blokk
+        html_3:
+          name: Tredje HTML-blokk
+        metadata:
+          developer_group: Promotert av
+          name: Metadata
+          participatory_scope: Hva er bestemt
+          participatory_structure: Hvordan blir det bestemt
+          target: Hvem deltar
+        participatory_processes:
+          name: Deltakende prosesser
         stats:
           name: Aktivitet
+        title:
+          meta_scope: Omfang
+          name: Tittel, beskrivelse og hashtag
+          participatory_processes:
+            one: 1 prosess
+            other: "%{count} prosesser"
       show:
         title: Prosessgrupper
     participatory_process_steps:
@@ -312,9 +354,17 @@
         content_blocks:
           highlighted_processes:
             max_results: Maksimalt antall elementer som vises
+        new_import:
+          accepted_types:
+            json: JSON
         participatory_process_copies:
           form:
             slug_help: 'URL slugs brukes til å generere nettadressene som peker på denne prosessen. Godtar bare bokstaver, tall og bindestreker, og må starte med en bokstav. Eksempel: %{url}'
+        participatory_process_groups:
+          form:
+            metadata: Metadata
+            title: Generell Informasjon
+            visibility: Synlighet
         participatory_process_imports:
           form:
             document_legend: Legg til et dokumentet
@@ -352,7 +402,12 @@
             active_step: Aktiv medvirkningsfase
             more_information: Mer informasjon
             participate: Delta
+            participate_in: Delta i prosess %{resource_name}
+            processes_button_title: Lenke til prosessiden som viser alle prosesser
             see_all_processes: Se alle prosesser
+      participatory_process_steps:
+        index:
+          back_to_process: Tilbake til prosesssiden
       participatory_processes:
         filters:
           counters:
@@ -382,6 +437,8 @@
           loading: Laster inn resultater...
       show:
         area: Område
+        belongs_to_group: Denne prosessen tilhører
+        dates: Datoer
         developer_group: Prosessen styres av
         end_date: Sluttdato
         local_area: Organisasjonsområde
@@ -393,11 +450,14 @@
         start_date: Startdato
         target: Hvem kan delta
         unspecified: Ikke spesifisert
+    statistics:
+      processes_count: Prosesser
   layouts:
     decidim:
       participatory_process_groups:
         participatory_process_group:
           browse: Bla gjennom
+          browse_resource: Bla gjennom prosessgruppe %{resource_name}
           processes_count: 'Prosesser:'
       participatory_process_widgets:
         show:
@@ -409,11 +469,17 @@
         participatory_process:
           active_step: 'Nåværende fase:'
           more_info: Mer info
+          more_info_about: Mer informasjon om prosess %{resource_name}
           take_part: Delta
+          take_part_in: Delta i prosess %{resource_name}
         promoted_process:
           active_step: 'Nåværende fase:'
           more_info: Mer info
+          more_info_about: Mer informasjon om prosess %{resource_name}
           take_part: Delta
+          take_part_in: Delta i prosess %{resource_name}
+        promoted_process_group:
+          more_info: Mer info
       process_header_steps:
         step: Fase %{current} av %{total}
         view_steps: Vis faser

data/lib/decidim/participatory_processes/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-participatory_processes version.
   module ParticipatoryProcesses
     def self.version
-      "0.26.0.rc1"
+      "0.26.1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-participatory_processes
 version: !ruby/object:Gem::Version
-  version: 0.26.0.rc1
+  version: 0.26.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc1
+        version: 0.26.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc1
+        version: 0.26.1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc1
+        version: 0.26.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc1
+        version: 0.26.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc1
+        version: 0.26.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc1
+        version: 0.26.1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc1
+        version: 0.26.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc1
+        version: 0.26.1
 description: Participatory processes component for decidim.
 email:
 - josepjaume@gmail.com
@@ -430,9 +430,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: