decidim-initiatives 0.14.4 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77c14067bc7237757419f227e84ec0f721e9d57479f5ebdde27d7c41a404357b
-  data.tar.gz: f927ab668492100bab589cd4545365de108886c2967de039f807b3fc9278af9b
+  metadata.gz: 902007a91cd56a0262dc940099b2a85490e971c84b0751028c400ad7f03a1912
+  data.tar.gz: 381db5f91900f557c77aa2becf61268a538e6c26f0c6980b6bcbdfd1b797c469
 SHA512:
-  metadata.gz: 55a9527f0c4011b75f9cd488ca6a39303eb559843d216685f0a13b5714a56d876a054cd7cbc6e423ecb1f10e968b83e7f8ff9373eeb6b9ecce8323ac823be1f3
-  data.tar.gz: 96a91b58d380aba2146df773e854fcc61a81ca95c433183811a616c63fd4888fc04ab2ad62929f6abe98317523e46ba2fa17d4130185f6a5dc4814167b426317
+  metadata.gz: 4202350870ac6c6d1e377c0e2a1f29d81db3e6b5306cf94b8c9e431caf12173cd2412ef2d60253dbacee46b31e8d434b9a3953fa17291b701ca205657125c3ff
+  data.tar.gz: 9728c457241db360f25f7a0862f8a3f1fa78fd9dfcab47ebf34a36205005d729a699ce50ee99944614569c23821bf008c800972caa0c8475d4ff3507adbfc7a7

data/app/assets/images/decidim/initiatives/icon.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 34 34">
+  <path d="M17 1.889C8.654 1.889 1.889 8.654 1.889 17S8.654 32.111 17 32.111 32.111 25.346 32.111 17 25.346 1.889 17 1.889zM17 0c9.389 0 17 7.611 17 17s-7.611 17-17 17S0 26.389 0 17 7.611 0 17 0zm4.722 18.082v-2.97a.944.944 0 1 0-1.889 0v2.97a.944.944 0 1 0 1.89 0zm-2.833 0v-2.97a.944.944 0 0 0-1.889 0v2.97a.944.944 0 1 0 1.889 0zm-3.778.488V8.5a.944.944 0 0 0-1.889 0v10.07a.944.944 0 0 0 1.89 0zM8.5 16.92c.814 0 1.593.78 1.593 1.594v.2c0 4.131 3.302 7.432 7.373 7.356 4.114 0 7.415-3.301 7.339-7.373V15.11a.944.944 0 0 0-1.889 0v3.603c.056 3.025-2.385 5.468-5.467 5.468-3.025.056-5.467-2.386-5.467-5.468v-.2c0-1.857-1.625-3.482-3.482-3.482a.944.944 0 0 0 0 1.889z"/>
+</svg>

data/app/cells/decidim/initiative_activity_cell.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A cell to display when an initiative has been published.
+  class InitiativeActivityCell < ActivityCell
+    def title
+      I18n.t "decidim.initiatives.last_activity.new_initiative"
+    end
+  end
+end

data/app/cells/decidim/initiatives/content_blocks/highlighted_initiatives_cell.rb

@@ -10,8 +10,15 @@ module Decidim
           render if highlighted_initiatives.any?
         end
 
+        def max_results
+          model.settings.max_results
+        end
+
         def highlighted_initiatives
-          OrganizationPrioritizedInitiatives.new(current_organization)
+          @highlighted_initiatives ||= OrganizationPrioritizedInitiatives
+                                       .new(current_organization)
+                                       .query
+                                       .limit(max_results)
         end
 
         def i18n_scope

data/app/cells/decidim/initiatives/content_blocks/highlighted_initiatives_settings_form/show.erb

@@ -0,0 +1,3 @@
+<% form.fields_for :settings, form.object.settings do |settings_fields| %>
+  <%= settings_fields.select :max_results, [4, 8, 12], prompt: "", label: label %>
+<% end %>

data/app/cells/decidim/initiatives/content_blocks/highlighted_initiatives_settings_form_cell.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module ContentBlocks
+      class HighlightedInitiativesSettingsFormCell < Decidim::ViewModel
+        alias form model
+
+        def content_block
+          options[:content_block]
+        end
+
+        def label
+          I18n.t("decidim.initiatives.admin.content_blocks.highlighted_initiatives.max_results")
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/initiatives/admin/publish_initiative.rb

@@ -27,7 +27,8 @@ module Decidim
           @initiative = Decidim.traceability.perform_action!(
             :publish,
             initiative,
-            current_user
+            current_user,
+            visibility: "all"
           ) do
             initiative.publish!
             increment_score
@@ -41,7 +42,11 @@ module Decidim
         attr_reader :initiative, :current_user
 
         def increment_score
-          Decidim::Gamification.increment_score(initiative.author, :initiatives)
+          if initiative.user_group
+            Decidim::Gamification.increment_score(initiative.user_group, :initiatives)
+          else
+            Decidim::Gamification.increment_score(initiative.author, :initiatives)
+          end
         end
       end
     end

data/app/forms/decidim/initiatives/admin/initiative_form.rb

@@ -15,8 +15,8 @@ module Decidim
         attribute :type_id, Integer
         attribute :decidim_scope_id, Integer
         attribute :signature_type, String
-        attribute :signature_start_date, Date
-        attribute :signature_end_date, Date
+        attribute :signature_start_date, Decidim::Attributes::LocalizedDate
+        attribute :signature_end_date, Decidim::Attributes::LocalizedDate
         attribute :hashtag, String
         attribute :offline_votes, Integer
 

data/app/mailers/decidim/initiatives/initiatives_mailer.rb

@@ -12,6 +12,7 @@ module Decidim
 
       # Notifies initiative creation
       def notify_creation(initiative)
+        return if initiative.author.email.blank?
         @initiative = initiative
         @organization = initiative.organization
 
@@ -27,6 +28,7 @@ module Decidim
 
       # Notify changes in state
       def notify_state_change(initiative, user)
+        return if user.email.blank?
         @organization = initiative.organization
 
         with_user(user) do
@@ -49,6 +51,7 @@ module Decidim
 
       # Notify an initiative requesting technical validation
       def notify_validating_request(initiative, user)
+        return if user.email.blank?
         @organization = initiative.organization
         @link = decidim_admin_initiatives.edit_initiative_url(initiative, host: @organization.host)
 
@@ -68,6 +71,7 @@ module Decidim
 
       # Notify progress to all initiative subscribers.
       def notify_progress(initiative, user)
+        return if user.email.blank?
         @organization = initiative.organization
         @link = initiative_url(initiative, host: @organization.host)
 

data/app/permissions/decidim/initiatives/permissions.rb

@@ -67,7 +67,7 @@ module Decidim
         Decidim::Initiatives.creation_enabled && (
           Decidim::Initiatives.do_not_require_authorization ||
             UserAuthorizations.for(user).any? ||
-            user.user_groups.verified.any?
+            Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?
         )
       end
 
@@ -80,7 +80,7 @@ module Decidim
                       (
                         Decidim::Initiatives.do_not_require_authorization ||
                         UserAuthorizations.for(user).any? ||
-                        user.user_groups.verified.any?
+                        Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?
                       )
 
         toggle_allow(can_request)
@@ -107,7 +107,7 @@ module Decidim
         can_vote = initiative.votes_enabled? &&
                    initiative.organization&.id == user.organization&.id &&
                    initiative.votes.where(decidim_author_id: user.id, decidim_user_group_id: decidim_user_group_id).empty? &&
-                   (can_user_support?(initiative) || user.user_groups.verified.any?)
+                   (can_user_support?(initiative) || Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?)
 
         toggle_allow(can_vote)
       end
@@ -119,7 +119,7 @@ module Decidim
         can_unvote = initiative.votes_enabled? &&
                      initiative.organization&.id == user.organization&.id &&
                      initiative.votes.where(decidim_author_id: user.id, decidim_user_group_id: decidim_user_group_id).any? &&
-                     (can_user_support?(initiative) || user.user_groups.verified.any?)
+                     (can_user_support?(initiative) || Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?)
 
         toggle_allow(can_unvote)
       end

data/app/services/decidim/initiatives/initiative_search.rb

@@ -47,7 +47,7 @@ module Decidim
         query
           .joins(:scoped_type)
           .where(
-            "decidim_initiatives_type_scopes.decidim_initiatives_types_id = ?",
+            "decidim_initiatives_type_scopes.decidim_initiatives_types_id IN (?)",
             type
           )
       end

data/app/views/decidim/initiatives/admin/initiatives/show.html.erb

@@ -99,6 +99,9 @@
 <h2 class="print-section-title">Sol·liciten que sigui admesa a tràmit la Iniciativa Ciutadana que porta el títol de:</h2>
 <%= translated_attribute(current_initiative.title) %>
 
+<h2 class="print-section-title">Tipus de la Iniciativa:</h2>
+<%= translated_attribute(current_initiative.type.title) %>
+
 <h2 class="print-section-title">Definició de la Iniciativa:</h2>
 <%= decidim_sanitize translated_attribute(current_initiative.description) %>
 

data/app/views/decidim/initiatives/create_initiative/fill_data.html.erb

@@ -46,10 +46,10 @@
                            prompt: t(".select_scope") %>
             </div>
 
-            <% if current_user.user_groups.verified.any? %>
+            <% if Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
               <div class="field">
                 <%= f.select :decidim_user_group_id,
-                             current_user.user_groups.verified.map{ |g| [g.name, g.id] },
+                             Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.map{ |g| [g.name, g.id] },
                              prompt: current_user.name %>
               </div>
             <% end %>

data/app/views/decidim/initiatives/initiatives/_vote_cabin.html.erb

@@ -1,4 +1,4 @@
-<% if current_user && current_user.user_groups.verified.any? %>
+<% if current_user && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
   <button id="select-identity-button"
           class="card__button button expanded button--sc">
     <%= t(".vote") %>

data/app/views/decidim/initiatives/initiatives/signature_identities.html.erb

@@ -9,7 +9,7 @@
                unvote_label: current_user.name
            } unless current_initiative.offline? %>
 
-<% current_user.user_groups.verified.each do |g| %>
+<% Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.each do |g| %>
   <br />
   <% if @voted_groups.include? g.id %>
     <%= button_to(

data/app/views/layouts/decidim/admin/initiative.html.erb

@@ -1,6 +1,7 @@
 <% content_for :secondary_nav do %>
   <div class="secondary-nav secondary-nav--subnav">
     <ul>
+      <%= public_page_link decidim_initiatives.initiative_path(current_initiative) %>
       <% if allowed_to? :edit, :initiative, initiative: current_initiative %>
         <li <% if is_active_link?(decidim_admin_initiatives.edit_initiative_path(current_initiative)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t(".information"), decidim_admin_initiatives.edit_initiative_path(current_initiative) %>

data/config/locales/ca.yml

@@ -85,9 +85,12 @@ ca:
     gamification:
       badges:
         initiatives:
+          conditions:
+            - Anar a Inciatives
+            - Segueix els passos per crear una nova iniciativa
+          description: Aquest distintiu es concedeix quan es llancen noves iniciatives, unint-te amb altres per dur-les a terme.
           description_another: Aquest usuari ha publicat %{score} iniciatives.
           description_own: Tens %{score} iniciatives publicades.
-          explanation: Els usuaris obtenen aquesta distinció mitjançant la publicació de les seves iniciatives.
           name: Iniciatives publicades
           next_level_in: Publica %{score} iniciatives més per arribar al següent nivell!
           unearned_another: Aquest usuari encara no ha publicat cap iniciativa.
@@ -102,6 +105,9 @@ ca:
             no_members_yet: No hi ha membres al comitè promotor
             revoke: Revocar
             title: Membres del comitè
+        content_blocks:
+          highlighted_initiatives:
+            max_results: Quantitat màxima d'elements que es mostraran
         initiatives:
           edit:
             accept: Accepta la iniciativa
@@ -327,6 +333,8 @@ ca:
         status_change_for: La iniciativa %{title} ha canviat d'estat
         technical_validation_body_for: La iniciativa %{title} ha demanat la seva validació tècnica.
         technical_validation_for: La iniciativa %{title} ha demanat la seva validació tècnica.
+      last_activity:
+        new_initiative: Nova iniciativa
       pages:
         home:
           highlighted_initiatives:

data/config/locales/de.yml

@@ -85,9 +85,12 @@ de:
     gamification:
       badges:
         initiatives:
+          conditions:
+            - Gehe zum Teilnehmerbereich von Intiativen
+            - Befolgen Sie die Schritte, um eine neue Initiative zu erstellen
+          description: Dieses Abzeichen wird gewährt, wenn Sie neue Initiativen starten und mit anderen zusammenarbeiten, um sie durchzuführen.
           description_another: Dieser Benutzer hat %{score} Initiativen veröffentlicht.
           description_own: Du hast %{score} Initiativen veröffentlicht.
-          explanation: Benutzer erhalten dieses Abzeichen, indem sie ihre Initiativen veröffentlichen lassen.
           name: Veröffentlichte Initiativen
           next_level_in: Holen Sie sich %{score} weitere Initiativen veröffentlicht, um das nächste Level zu erreichen!
           unearned_another: Dieser Benutzer hat noch keine Initiativen veröffentlicht.
@@ -102,6 +105,9 @@ de:
             no_members_yet: Es gibt keine Mitglieder im Promoter-Ausschuss
             revoke: Widerrufen
             title: Ausschussmitglieder
+        content_blocks:
+          highlighted_initiatives:
+            max_results: Maximale Anzahl der Elemente, die angezeigt werden sollen
         initiatives:
           edit:
             accept: Initiative akzeptieren
@@ -326,6 +332,8 @@ de:
         status_change_for: Die Initiative %{title} hat ihren Status geändert
         technical_validation_body_for: Die Initiative %{title} hat ihre technische Validierung beantragt.
         technical_validation_for: Die Initiative %{title} hat ihre technische Validierung beantragt.
+      last_activity:
+        new_initiative: Neue Initiative
       pages:
         home:
           highlighted_initiatives:

data/config/locales/en.yml

@@ -86,9 +86,12 @@ en:
     gamification:
       badges:
         initiatives:
+          conditions:
+          - Go to the participation space of Intiatives
+          - Follow the steps to create a new initiative
+          description: This badge is granted when you launch new initiatives, partnering with others to carry them out.
           description_another: This user has gotten %{score} initiatives published.
           description_own: You've got %{score} initiatives published.
-          explanation: Users get this badge by getting their initiatives published.
           name: Published initiatives
           next_level_in: Get %{score} more initiatives published to reach the next level!
           unearned_another: This user hasn't gotten any initiatives published yet.
@@ -103,6 +106,9 @@ en:
             no_members_yet: There are no members in the promoter committee
             revoke: Revoke
             title: Committee members
+        content_blocks:
+          highlighted_initiatives:
+            max_results: Maximum amount of elements to show
         initiatives:
           edit:
             accept: Accept initiative
@@ -328,6 +334,8 @@ en:
         status_change_for: The initiative %{title} has changed its state
         technical_validation_body_for: The initiative %{title} has requested its technical validation.
         technical_validation_for: The initiative %{title} has requested its technical validation.
+      last_activity:
+        new_initiative: New initiative
       pages:
         home:
           highlighted_initiatives:

data/config/locales/es-PY.yml

@@ -85,9 +85,12 @@ es-PY:
     gamification:
       badges:
         initiatives:
+          conditions:
+            - Ir al espacio de participación de Iniciativas.
+            - Sigue los pasos para crear una nueva iniciativa.
+          description: Este distintivo se otorga cuando lanza nuevas iniciativas, asociándose con otros para llevarlas a cabo.
           description_another: Este usuario ha publicado %{score} iniciativas.
           description_own: Tienes %{score} iniciativas publicadas.
-          explanation: Los usuarios obtienen esta insignia al publicar sus iniciativas.
           name: Iniciativas publicadas
           next_level_in: '¡Publica %{score} iniciativas más para llegar al siguiente nivel!'
           unearned_another: Este usuario aún no ha publicado ninguna iniciativa.
@@ -102,6 +105,9 @@ es-PY:
             no_members_yet: No hay miembros en el comité promotor
             revoke: Revocar
             title: Miembros del comité
+        content_blocks:
+          highlighted_initiatives:
+            max_results: Cantidad máxima de elementos para mostrar
         initiatives:
           edit:
             accept: Aceptar iniciativa
@@ -327,6 +333,8 @@ es-PY:
         status_change_for: La iniciativa %{title} ha cambiado su estado
         technical_validation_body_for: La iniciativa %{title} ha solicitado su validación técnica.
         technical_validation_for: La iniciativa %{title} ha solicitado su validación técnica.
+      last_activity:
+        new_initiative: Nueva iniciativa
       pages:
         home:
           highlighted_initiatives:

data/config/locales/es.yml

@@ -6,8 +6,8 @@ es:
         description: Descripción
         offline_votes: Apoyo cara a cara
         scope_id: Alcance
-        signature_end_date: Fin del período de recolección de firmas
-        signature_start_date: Inicio del período de recolección de firmas
+        signature_end_date: Fin del período de recogida de firmas
+        signature_start_date: Inicio del período de recogida de firmas
         signature_type: Tipo de colección de firma
         signature_type_values:
           any: Mezclado
@@ -85,9 +85,12 @@ es:
     gamification:
       badges:
         initiatives:
+          conditions:
+            - Ir al espacio de participación de Iniciativas
+            - Sigue los pasos para crear una nueva iniciativa.
+          description: Este distintivo se otorga cuando lanzas nuevas iniciativas, asociándote con otros para llevarlas a cabo.
           description_another: Este usuario ha publicado %{score} iniciativas.
           description_own: Tienes %{score} iniciativas publicadas.
-          explanation: Los usuarios obtienen esta insignia al publicar sus iniciativas.
           name: Iniciativas publicadas
           next_level_in: '¡Publica %{score} iniciativas más para llegar al siguiente nivel!'
           unearned_another: Este usuario aún no ha publicado ninguna iniciativa.
@@ -102,6 +105,9 @@ es:
             no_members_yet: No hay miembros en el comité promotor
             revoke: Revocar
             title: Miembros del comité
+        content_blocks:
+          highlighted_initiatives:
+            max_results: Cantidad máxima de elementos para mostrar
         initiatives:
           edit:
             accept: Aceptar iniciativa
@@ -327,6 +333,8 @@ es:
         status_change_for: La iniciativa %{title} ha cambiado su estado
         technical_validation_body_for: La iniciativa %{title} ha solicitado su validación técnica.
         technical_validation_for: La iniciativa %{title} ha solicitado su validación técnica.
+      last_activity:
+        new_initiative: Nueva iniciativa
       pages:
         home:
           highlighted_initiatives:

data/config/locales/eu.yml

@@ -85,9 +85,12 @@ eu:
     gamification:
       badges:
         initiatives:
+          conditions:
+            - Joan zaitez Intiatives-ko partaidetza eremura
+            - Jarraitu urrats berriak ekimen berri bat sortzeko
+          description: Idazmahaia ekimen berriak abiarazten dituzunean, besteekin elkarlanean aritzea ekartzen baduzu.
           description_another: Erabiltzaile honek argitaratutako %{score} ekimen lortu ditu.
           description_own: Argitaratutako %{score} ekimen dituzu.
-          explanation: Erabiltzaileek txapela lortzen dute beren ekimenak argitaratuz.
           name: Argitaratutako ekimenak
           next_level_in: Talde %{score} ekimen gehiago argitaratu hurrengo mailara iristeko!
           unearned_another: Erabiltzaile honek oraindik ez du argitaratutako ekimenik lortu.
@@ -102,6 +105,9 @@ eu:
             no_members_yet: Ez dago bazkide promoziorako batzordean
             revoke: Baliogabetu
             title: Batzorde kideak
+        content_blocks:
+          highlighted_initiatives:
+            max_results: Erakusteko elementu gehienen kopurua
         initiatives:
           edit:
             accept: Onartu ekimena
@@ -327,6 +333,8 @@ eu:
         status_change_for: '%{title} ekimena bere egoera aldatu du'
         technical_validation_body_for: '%{title} ekimena balidazio teknikoa eskatu du.'
         technical_validation_for: '%{title} ekimena balidazio teknikoa eskatu du.'
+      last_activity:
+        new_initiative: Ekimen berria
       pages:
         home:
           highlighted_initiatives:

data/config/locales/fi.yml

@@ -85,9 +85,12 @@ fi:
     gamification:
       badges:
         initiatives:
+          conditions:
+            - Siirry aloitteiden osallistumistilaan
+            - Luo uusi aloite ohjeiden mukaisesti
+          description: Tämä kunniamerkki myönnetään, kun laadit uusia aloitteita ja keräät verkoston ihmisiä toteuttamaan niitä.
           description_another: Tämä käyttäjä on julkaissut %{score} aloitetta.
           description_own: Olet julkaissut %{score} aloitetta.
-          explanation: Käyttäjät saavat tämän kunniamerkin saamalla aloitteita julkaistua.
           name: Julkaistut aloitteet
           next_level_in: Julkaise %{score} uutta aloitetta saavuttaaksesi seuraavan tason!
           unearned_another: Tämä käyttäjä ei ole vielä julkaissut yhtään aloitetta.
@@ -102,6 +105,9 @@ fi:
             no_members_yet: Tukikomiteassa ei ole jäseniä
             revoke: Kumoa
             title: Komitean jäsenet
+        content_blocks:
+          highlighted_initiatives:
+            max_results: Näytettävien elementtien enimmäismäärä
         initiatives:
           edit:
             accept: Hyväksy aloite
@@ -327,6 +333,8 @@ fi:
         status_change_for: Aloitteen %{title} tila on muuttunut
         technical_validation_body_for: Aloitteelle %{title} on pyydetty teknistä validointia.
         technical_validation_for: Aloitteelle %{title} on pyydetty teknistä validointia.
+      last_activity:
+        new_initiative: Uusi aloite
       pages:
         home:
           highlighted_initiatives:

data/config/locales/fr.yml

@@ -85,9 +85,12 @@ fr:
     gamification:
       badges:
         initiatives:
+          conditions:
+            - Accéder à l'espace de participation d'Initiatives
+            - Suivez les étapes pour créer une nouvelle initiative
+          description: Ce badge vous est attribué lorsque vous lancez de nouvelles initiatives, en partenariat avec d’autres pour les mener à bien.
           description_another: Cet utilisateur a reçu %{score} initiatives publiées.
           description_own: Vous avez publié %{score} initiatives.
-          explanation: Les utilisateurs obtiennent ce badge en publiant leurs initiatives.
           name: Initiatives publiées
           next_level_in: Obtenez %{score} autres initiatives publiées pour atteindre le niveau supérieur!
           unearned_another: Cet utilisateur n'a pas encore publié d'initiative.
@@ -102,6 +105,9 @@ fr:
             no_members_yet: Il n'y a pas encore de membres dans le Comité de promotion
             revoke: Révoquer
             title: Membres du comité de promotion
+        content_blocks:
+          highlighted_initiatives:
+            max_results: Quantité maximale d'éléments à afficher
         initiatives:
           edit:
             accept: Signer la pétition
@@ -327,6 +333,8 @@ fr:
         status_change_for: L'initiative %{title} a changé de statut
         technical_validation_body_for: Une validation technique a été demandée pour l'initiative %{title}.
         technical_validation_for: Une validation technique a été demandée pour l'initiative %{title}.
+      last_activity:
+        new_initiative: Nouvelle initiative
       pages:
         home:
           highlighted_initiatives:

data/config/locales/gl.yml

@@ -85,9 +85,12 @@ gl:
     gamification:
       badges:
         initiatives:
+          conditions:
+            - Ir ao espazo de participación de Intiatives
+            - Segue os pasos para crear unha nova iniciativa
+          description: Este distintivo concedeuse cando se lanzan novas iniciativas, se asocian con outras persoas para realizalas.
           description_another: Este usuario obtivo %{score} iniciativas publicadas.
           description_own: Tes publicado %{score} iniciativas.
-          explanation: Os usuarios obtén esta insignia ao publicar as súas iniciativas.
           name: Iniciativas publicadas
           next_level_in: Recibe %{score} iniciativas máis publicadas para alcanzar o seguinte nivel!
           unearned_another: Este usuario aínda non recibiu ningunha iniciativa publicada.
@@ -102,6 +105,9 @@ gl:
             no_members_yet: Non hai membros no comité promotor
             revoke: Revocar
             title: Membros do comité
+        content_blocks:
+          highlighted_initiatives:
+            max_results: Cantidade máxima de elementos para mostrar
         initiatives:
           edit:
             accept: Acepte a iniciativa
@@ -327,6 +333,8 @@ gl:
         status_change_for: A iniciativa %{title} cambiou o seu estado
         technical_validation_body_for: A iniciativa %{title} solicitou a súa validación técnica.
         technical_validation_for: A iniciativa %{title} solicitou a súa validación técnica.
+      last_activity:
+        new_initiative: Nova iniciativa
       pages:
         home:
           highlighted_initiatives:

data/config/locales/hu.yml

@@ -85,9 +85,12 @@ hu:
     gamification:
       badges:
         initiatives:
+          conditions:
+            - Menjen az Intiatives részvételi helyére
+            - Kövesse az új kezdeményezés létrehozásához szükséges lépéseket
+          description: Ezt a jelvényt akkor kapja meg, ha új kezdeményezéseket indít el, és másokkal partnerséget hajt végre.
           description_another: Ez a felhasználó %{score} kezdeményezést kapott.
           description_own: '%{score} kezdeményezéseid közzétéve.'
-          explanation: A jelvényt kezdeményezések közzétételével szerezheted meg.
           name: Közzétett kezdeményezések
           next_level_in: Szerezz még %{score} kezdeményezéseket a következő szint eléréséhez!
           unearned_another: A felhasználó még nem tett közzé kezdeményezéseket.
@@ -102,6 +105,9 @@ hu:
             no_members_yet: A promóciós bizottságban nincsenek tagok
             revoke: Visszavonás
             title: Bizottsági tagok
+        content_blocks:
+          highlighted_initiatives:
+            max_results: A megjelenítendő elemek maximális száma
         initiatives:
           edit:
             accept: Kezdeményezés elfogadása
@@ -327,6 +333,8 @@ hu:
         status_change_for: A(z) %{title} kezdeményezés állapota változott
         technical_validation_body_for: A(z) %{title} kezdeményezés technikai érvényesítését kérted.
         technical_validation_for: A(z) %{title} kezdeményezés technikai érvényesítését kérted.
+      last_activity:
+        new_initiative: Új kezdeményezés
       pages:
         home:
           highlighted_initiatives:

data/config/locales/it.yml

@@ -85,9 +85,12 @@ it:
     gamification:
       badges:
         initiatives:
+          conditions:
+            - Vai allo spazio di partecipazione delle iniziative
+            - Segui i passaggi per creare una nuova iniziativa
+          description: Questo badge è garantito quando lanci nuove iniziative, collaborando con altri per realizzarle.
           description_another: Questo utente ha ottenuto %{score} iniziative pubblicate.
           description_own: Hai pubblicato %{score} iniziative.
-          explanation: Gli utenti ottengono questo badge pubblicando le loro iniziative.
           name: Iniziative pubblicate
           next_level_in: Ricevi altre %{score} iniziative pubblicate per raggiungere il livello successivo!
           unearned_another: Questo utente non ha ancora ottenuto alcuna iniziativa pubblicata.
@@ -102,6 +105,9 @@ it:
             no_members_yet: Non ci sono membri nel comitato promotore
             revoke: Revocare
             title: membri del Comitato
+        content_blocks:
+          highlighted_initiatives:
+            max_results: Quantità massima di elementi da mostrare
         initiatives:
           edit:
             accept: Accetta l'iniziativa
@@ -327,6 +333,8 @@ it:
         status_change_for: L'iniziativa %{title} ha cambiato il suo stato
         technical_validation_body_for: L'iniziativa %{title} ha richiesto la sua convalida tecnica.
         technical_validation_for: L'iniziativa %{title} ha richiesto la sua convalida tecnica.
+      last_activity:
+        new_initiative: Nuova iniziativa
       pages:
         home:
           highlighted_initiatives:

data/config/locales/nl.yml

@@ -85,9 +85,12 @@ nl:
     gamification:
       badges:
         initiatives:
+          conditions:
+            - Ga naar de participatieruimte van Intiatives
+            - Volg de stappen om een ​​nieuw initiatief te maken
+          description: Deze badge wordt toegekend wanneer u nieuwe initiatieven start en samenwerkt met anderen om ze uit te voeren.
           description_another: Deze gebruiker heeft %{score} initiatieven gepubliceerd.
           description_own: Je hebt %{score} initiatieven gepubliceerd.
-          explanation: Gebruikers krijgen deze badge door hun initiatieven gepubliceerd te krijgen.
           name: Gepubliceerde initiatieven
           next_level_in: Ontvang nog %{score} initiatieven die zijn gepubliceerd om het volgende niveau te bereiken!
           unearned_another: Deze gebruiker heeft nog geen initiatieven gepubliceerd.
@@ -102,6 +105,9 @@ nl:
             no_members_yet: Er zijn geen leden in de promotieraad
             revoke: Intrekken
             title: Commissieleden
+        content_blocks:
+          highlighted_initiatives:
+            max_results: Maximum aantal elementen dat kan worden weergegeven
         initiatives:
           edit:
             accept: Accepteer initiatief
@@ -327,6 +333,8 @@ nl:
         status_change_for: Het initiatief %{title} is van status veranderd
         technical_validation_body_for: Het initiatief %{title} heeft om technische validatie ervan verzocht.
         technical_validation_for: Het initiatief %{title} heeft om technische validatie ervan verzocht.
+      last_activity:
+        new_initiative: Nieuw initiatief
       pages:
         home:
           highlighted_initiatives:
@@ -354,7 +362,7 @@ nl:
         show_similar_initiatives: Vergelijken
       initiative_header:
         initiative_menu_item: Initiatief
-        unfold: Ontvouwen
+        unfold: Uitvouwen
       initiatives:
         initiative:
           check: Bekijken

data/config/locales/pl.yml

@@ -91,9 +91,12 @@ pl:
     gamification:
       badges:
         initiatives:
+          conditions:
+            - Idź do miejsca uczestnictwa Intiatives
+            - Postępuj zgodnie z instrukcjami, aby utworzyć nową inicjatywę
+          description: Ta odznaka jest przyznawana, gdy uruchamiasz nowe inicjatywy, współpracując z innymi, aby je zrealizować.
           description_another: Ten użytkownik otrzymał %{score} opublikowanych inicjatyw.
           description_own: Masz opublikowanych %{score} inicjatyw.
-          explanation: Użytkownicy otrzymują tę odznakę, publikując swoje inicjatywy.
           name: Opublikowane inicjatywy
           next_level_in: Uzyskaj %{score} dodatkowych inicjatyw opublikowanych, aby przejść do następnego poziomu!
           unearned_another: Ten użytkownik nie otrzymał jeszcze żadnych inicjatyw.
@@ -108,6 +111,9 @@ pl:
             no_members_yet: W komisji promotorskiej nie ma członków
             revoke: Unieważnić
             title: członkowie Komitetu
+        content_blocks:
+          highlighted_initiatives:
+            max_results: Maksymalna ilość elementów do pokazania
         initiatives:
           edit:
             accept: Przyjmij inicjatywę
@@ -341,6 +347,8 @@ pl:
         status_change_for: Inicjatywa %{title} zmieniła swój stan
         technical_validation_body_for: Inicjatywa %{title} zażądała technicznej weryfikacji.
         technical_validation_for: Inicjatywa %{title} zażądała technicznej weryfikacji.
+      last_activity:
+        new_initiative: Nowa inicjatywa
       pages:
         home:
           highlighted_initiatives:

data/config/locales/pt-BR.yml

@@ -85,9 +85,12 @@ pt-BR:
     gamification:
       badges:
         initiatives:
+          conditions:
+            - Ir para o espaço de participação de Iniciativas
+            - Siga os passos para criar uma nova iniciativa
+          description: Esse selo é concedido quando você lança novas iniciativas, estabelecendo parcerias com outras pessoas para realizá-las.
           description_another: Este usuário obteve %{score} iniciativas publicadas.
           description_own: Você tem %{score} iniciativas publicadas.
-          explanation: Os usuários recebem esse selo ao publicar suas iniciativas.
           name: Iniciativas publicadas
           next_level_in: Obtenha mais %{score} iniciativas publicadas para alcançar o próximo nível!
           unearned_another: Este usuário ainda não publicou nenhuma iniciativa.
@@ -102,6 +105,9 @@ pt-BR:
             no_members_yet: Não há membros no comitê de promotores
             revoke: Revogar
             title: membros do Comitê
+        content_blocks:
+          highlighted_initiatives:
+            max_results: Quantidade máxima de elementos para mostrar
         initiatives:
           edit:
             accept: Aceitar iniciativa
@@ -327,6 +333,8 @@ pt-BR:
         status_change_for: A iniciativa %{title} mudou seu estado
         technical_validation_body_for: A iniciativa %{title} solicitou sua validação técnica.
         technical_validation_for: A iniciativa %{title} solicitou sua validação técnica.
+      last_activity:
+        new_initiative: Nova iniciativa
       pages:
         home:
           highlighted_initiatives:

data/config/locales/pt.yml

@@ -85,9 +85,12 @@ pt:
     gamification:
       badges:
         initiatives:
+          conditions:
+            - Ir para o espaço de participação de Intiatives
+            - Siga os passos para criar uma nova iniciativa
+          description: Esse selo é concedido quando você lança novas iniciativas, estabelecendo parcerias com outras pessoas para realizá-las.
           description_another: Este usuário obteve %{score} iniciativas publicadas.
           description_own: Você tem %{score} iniciativas publicadas.
-          explanation: Os usuários recebem esse selo ao publicar suas iniciativas.
           name: Iniciativas publicadas
           next_level_in: Obtenha mais %{score} iniciativas publicadas para alcançar o próximo nível!
           unearned_another: Este usuário ainda não publicou nenhuma iniciativa.
@@ -102,6 +105,9 @@ pt:
             no_members_yet: Não há membros no comitê de promotores
             revoke: Revogar
             title: membros do Comitê
+        content_blocks:
+          highlighted_initiatives:
+            max_results: Quantidade máxima de elementos para mostrar
         initiatives:
           edit:
             accept: Aceitar iniciativa
@@ -327,6 +333,8 @@ pt:
         status_change_for: A iniciativa %{title} mudou seu estado
         technical_validation_body_for: A iniciativa %{title} solicitou sua validação técnica.
         technical_validation_for: A iniciativa %{title} solicitou sua validação técnica.
+      last_activity:
+        new_initiative: Nova iniciativa
       pages:
         home:
           highlighted_initiatives:

data/config/locales/sv.yml

@@ -85,9 +85,12 @@ sv:
     gamification:
       badges:
         initiatives:
+          conditions:
+            - Gå till Intiatives deltagande utrymme
+            - Följ stegen för att skapa ett nytt initiativ
+          description: Detta märke beviljas när du startar nya initiativ, samarbetar med andra för att utföra dem.
           description_another: Den här användaren har fått %{score} initiativ publicerade.
           description_own: Du har %{score} initiativ publicerade.
-          explanation: Användare får detta märke genom att få sina initiativ publicerade.
           name: Publicerade initiativ
           next_level_in: Få %{score} fler initiativ publicerade för att nå nästa nivå!
           unearned_another: Den här användaren har inte fått några initiativ publicerade än.
@@ -102,6 +105,9 @@ sv:
             no_members_yet: Det finns inga medlemmar i promotorkommittén
             revoke: Återkalla
             title: kommittémedlemmar
+        content_blocks:
+          highlighted_initiatives:
+            max_results: Maximal mängd element att visa
         initiatives:
           edit:
             accept: Acceptera initiativ
@@ -327,6 +333,8 @@ sv:
         status_change_for: Initiativet %{title} har ändrat sitt tillstånd
         technical_validation_body_for: Initiativet %{title} har begärt sin tekniska validering.
         technical_validation_for: Initiativet %{title} har begärt sin tekniska validering.
+      last_activity:
+        new_initiative: Nytt initiativ
       pages:
         home:
           highlighted_initiatives:

data/db/migrate/20181003082010_fix_user_groups_ids_on_initiatives.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class FixUserGroupsIdsOnInitiatives < ActiveRecord::Migration[5.2]
+  # rubocop:disable Rails/SkipsModelValidations
+  def change
+    Decidim::UserGroup.find_each do |group|
+      old_id = group.extended_data["old_user_group_id"]
+      next unless old_id
+
+      Decidim::Initiative
+        .where(decidim_user_group_id: old_id)
+        .update_all(decidim_user_group_id: group.id)
+      Decidim::InitiativesVote
+        .where(decidim_user_group_id: old_id)
+        .update_all(decidim_user_group_id: group.id)
+    end
+  end
+  # rubocop:enable Rails/SkipsModelValidations
+end

data/db/migrate/20181016095744_make_initiative_authors_polymorphic.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class MakeInitiativeAuthorsPolymorphic < ActiveRecord::Migration[5.2]
+  class Initiative < ApplicationRecord
+    self.table_name = :decidim_initiatives
+  end
+
+  def change
+    remove_index :decidim_initiatives, :decidim_author_id
+
+    add_column :decidim_initiatives, :decidim_author_type, :string
+
+    reversible do |direction|
+      direction.up do
+        execute <<~SQL.squish
+          UPDATE decidim_initiatives
+          SET decidim_author_type = 'Decidim::UserBaseEntity'
+        SQL
+      end
+    end
+
+    add_index :decidim_initiatives,
+              [:decidim_author_id, :decidim_author_type],
+              name: "index_decidim_initiatives_on_decidim_author"
+
+    change_column_null :decidim_initiatives, :decidim_author_id, false
+    change_column_null :decidim_initiatives, :decidim_author_type, false
+
+    Initiative.reset_column_information
+  end
+end

data/lib/decidim/initiatives/engine.rb

@@ -65,6 +65,11 @@ module Decidim
         Decidim.content_blocks.register(:homepage, :highlighted_initiatives) do |content_block|
           content_block.cell = "decidim/initiatives/content_blocks/highlighted_initiatives"
           content_block.public_name_key = "decidim.initiatives.content_blocks.highlighted_initiatives.name"
+          content_block.settings_form_cell = "decidim/initiatives/content_blocks/highlighted_initiatives_settings_form"
+
+          content_block.settings do |settings|
+            settings.attribute :max_results, type: :integer, default: 4
+          end
         end
       end
 
@@ -86,10 +91,19 @@ module Decidim
         Decidim::Gamification.register_badge(:initiatives) do |badge|
           badge.levels = [1, 5, 15, 30, 50]
 
-          badge.reset = lambda { |user|
-            Decidim::Initiative.where(
-              author: user
-            ).published.count
+          badge.valid_for = [:user, :user_group]
+
+          badge.reset = lambda { |model|
+            if model.is_a?(User)
+              Decidim::Initiative.where(
+                author: model,
+                user_group: nil
+              ).published.count
+            elsif model.is_a?(UserGroup)
+              Decidim::Initiative.where(
+                user_group: model
+              ).published.count
+            end
           }
         end
       end

data/lib/decidim/initiatives/participatory_space.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 Decidim.register_participatory_space(:initiatives) do |participatory_space|
+  participatory_space.icon = "decidim/initiatives/icon.svg"
   participatory_space.stylesheet = "decidim/initiatives/initiatives"
 
   participatory_space.context(:public) do |context|
@@ -58,7 +59,7 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
       Decidim::Initiative.skip_callback(:save, :after, :notify_state_change, raise: false)
       Decidim::Initiative.skip_callback(:create, :after, :notify_creation, raise: false)
 
-      initiative = Decidim::Initiative.create!(
+      params = {
         title: Decidim::Faker::Localized.sentence(3),
         description: Decidim::Faker::Localized.sentence(25),
         scoped_type: Decidim::InitiativesTypeScope.reorder(Arel.sql("RANDOM()")).first,
@@ -69,7 +70,16 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
         published_at: Time.current - 7.days,
         author: Decidim::User.reorder(Arel.sql("RANDOM()")).first,
         organization: organization
-      )
+      }
+
+      initiative = Decidim.traceability.perform_action!(
+        "publish",
+        Decidim::Initiative,
+        organization.users.first,
+        visibility: "all"
+      ) do
+        Decidim::Initiative.create!(params)
+      end
 
       Decidim::Comments::Seed.comments_for(initiative)
 

data/lib/decidim/initiatives/test/factories.rb

@@ -5,8 +5,8 @@ require "decidim/dev"
 
 FactoryBot.define do
   factory :initiatives_type, class: Decidim::InitiativesType do
-    title { Decidim::Faker::Localized.sentence(3) }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
+    title { generate_localized_title }
+    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") }
     organization
   end
@@ -18,8 +18,8 @@ FactoryBot.define do
   end
 
   factory :initiative, class: Decidim::Initiative do
-    title { Decidim::Faker::Localized.sentence(3) }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
+    title { generate_localized_title }
+    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     organization
     author { create(:user, :confirmed, organization: organization) }
     published_at { Time.current }

data/lib/decidim/initiatives/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-initiatives version.
   module Initiatives
     def self.version
-      "0.14.4"
+      "0.15.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-initiatives
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.15.0
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: decidim-verifications
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 description: Citizen initiatives plugin for decidim.
 email:
 - jsperezg@gmail.com
@@ -135,6 +135,7 @@ files:
 - app/assets/config/decidim_initiatives_manifest.css
 - app/assets/config/decidim_initiatives_manifest.js
 - app/assets/images/decidim/gamification/badges/initiatives.svg
+- app/assets/images/decidim/initiatives/icon.svg
 - app/assets/javascripts/decidim/initiatives/admin/invite_users.js
 - app/assets/javascripts/decidim/initiatives/application.js
 - app/assets/javascripts/decidim/initiatives/identity_selector_dialog.js
@@ -146,8 +147,11 @@ files:
 - app/assets/stylesheet/decidim/initiatives/print-initiative.css.scss
 - app/assets/stylesheet/decidim/initiatives/social_share.css.scss
 - app/assets/stylesheet/decidim/initiatives/statistics.css.scss
+- app/cells/decidim/initiative_activity_cell.rb
 - app/cells/decidim/initiatives/content_blocks/highlighted_initiatives/show.erb
 - app/cells/decidim/initiatives/content_blocks/highlighted_initiatives_cell.rb
+- app/cells/decidim/initiatives/content_blocks/highlighted_initiatives_settings_form/show.erb
+- app/cells/decidim/initiatives/content_blocks/highlighted_initiatives_settings_form_cell.rb
 - app/cells/decidim/initiatives/initiative_cell.rb
 - app/cells/decidim/initiatives/initiative_m/author.erb
 - app/cells/decidim/initiatives/initiative_m/footer.erb
@@ -331,6 +335,8 @@ files:
 - db/migrate/20171204103119_remove_requires_validation_from_decidim_initiatives_type.rb
 - db/migrate/20171214161410_add_unique_on_votes.rb
 - db/migrate/20180726071704_rename_signature_time_fields_to_signature_date.rb
+- db/migrate/20181003082010_fix_user_groups_ids_on_initiatives.rb
+- db/migrate/20181016095744_make_initiative_authors_polymorphic.rb
 - db/seeds/city2.jpeg
 - lib/decidim/initiatives.rb
 - lib/decidim/initiatives/admin.rb
@@ -363,7 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Decidim initiatives module