decidim-proposals 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9df80d4c69d5b3ec8115efc229349fb8cd77f13d
-  data.tar.gz: 136f30ac0eadafe019cce1e931b3b8a18177a50f
+  metadata.gz: b12997b073df30a39c65fe324ea4d554fc0ccd71
+  data.tar.gz: 41233b11794f168609b5238fabbd8a3604bca5b1
 SHA512:
-  metadata.gz: 1cfd7137a4c2ac6143c1f4217e957f1dce1539ec1c84686d5ea358679256ec0abf5870e3ba22a0b4fc31d6810f50c5102512107bf153917f9e90628f23c80a5e
-  data.tar.gz: d9c88ecda799aeed43f424dc9e01cd2645ad3acb52ae4c0e2e4980b91e50ee2432e46c4569c034124d9b968232f791131a8e558317a7059600b8c3d7a73c56d7
+  metadata.gz: 9dea5f65ad1f25577cd76e131deb0b117b1653ec52d2dcbd1b9b6bca7d13306080f12c7c12e94687f1168905a2e3a4692dae09882f338b209c9f49791212096c
+  data.tar.gz: 92d42424a3058fd4abfbbd68e70e3c77309573583da53ce3789348b7ddf088053594eb0ae7878d8e4629b689092d0f79976c431a643e60506468ee111b080ae2

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

@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 35"><path d="M17.5 35A17.5 17.5 0 1 1 35 17.5 17.52 17.52 0 0 1 17.5 35zm0-33.06A15.56 15.56 0 1 0 33.06 17.5 15.57 15.57 0 0 0 17.5 1.94zm9.5 13.7H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zm0 3.68H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zM22.26 23H8a1 1 0 0 1 0-1.94h14.26a1 1 0 0 1 0 1.94z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 35">
+  <path d="M17.5 35A17.5 17.5 0 1 1 35 17.5 17.52 17.52 0 0 1 17.5 35zm0-33.06A15.56 15.56 0 1 0 33.06 17.5 15.57 15.57 0 0 0 17.5 1.94zm9.5 13.7H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zm0 3.68H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zM22.26 23H8a1 1 0 0 1 0-1.94h14.26a1 1 0 0 1 0 1.94z"/>
+</svg>

data/app/forms/decidim/proposals/admin/proposal_form.rb

@@ -34,7 +34,7 @@ module Decidim
         end
 
         def process_scope
-          current_feature.participatory_process.scope
+          current_feature.participatory_space.scope
         end
 
         alias feature current_feature

data/app/forms/decidim/proposals/proposal_form.rb

@@ -38,7 +38,7 @@ module Decidim
       end
 
       def process_scope
-        current_feature.participatory_process.scope
+        current_feature.participatory_space.scope
       end
 
       alias feature current_feature

data/app/models/decidim/proposals/abilities/participatory_process_admin_ability.rb

@@ -10,7 +10,7 @@ module Decidim
           super
 
           can [:manage, :unreport, :hide], Proposal do |proposal|
-            can_manage_process?(proposal.feature.participatory_process)
+            can_manage_process?(proposal.feature.participatory_space)
           end
 
           cannot :create, Proposal unless can_create_proposal?
@@ -34,7 +34,7 @@ module Decidim
         def can_create_proposal?
           current_settings.try(:creation_enabled?) &&
             feature_settings.try(:official_proposals_enabled) &&
-            can_manage_process?(current_feature.try(:participatory_process))
+            can_manage_process?(current_feature.try(:participatory_space))
         end
 
         def can_update_proposal?

data/app/models/decidim/proposals/abilities/participatory_process_moderator_ability.rb

@@ -10,7 +10,7 @@ module Decidim
           super
 
           can [:unreport, :hide], Proposal do |proposal|
-            can_manage_process?(proposal.feature.participatory_process)
+            can_manage_process?(proposal.feature.participatory_space)
           end
         end
       end

data/app/models/decidim/proposals/proposal.rb

@@ -12,6 +12,7 @@ module Decidim
       include Decidim::HasCategory
       include Decidim::Reportable
       include Decidim::HasAttachments
+      include Decidim::Followable
       include Decidim::Comments::Commentable
 
       feature_manifest_name "proposals"
@@ -84,7 +85,7 @@ module Decidim
 
       # Public: Overrides the `accepts_new_comments?` Commentable concern method.
       def accepts_new_comments?
-        commentable? && !feature.active_step_settings.comments_blocked
+        commentable? && !feature.current_settings.comments_blocked
       end
 
       # Public: Overrides the `comments_have_alignment?` Commentable concern method.
@@ -97,6 +98,12 @@ module Decidim
         true
       end
 
+      # Public: Override Commentable concern method `users_to_notify_on_comment_created`
+      def users_to_notify_on_comment_created
+        return (followers | feature.participatory_space.admins).uniq if official?
+        followers
+      end
+
       # Public: Overrides the `reported_content_url` Reportable concern method.
       def reported_content_url
         ResourceLocatorPresenter.new(self).url
@@ -106,20 +113,6 @@ module Decidim
       def official?
         author.nil?
       end
-
-      # Public: Overrides the `notifiable?` Notifiable concern method.
-      # When a proposal is commented the proposal's author is notified if it is not the same
-      # who has commented the proposal and if the proposal's author has comment notifications enabled.
-      def notifiable?(context)
-        return true if official?
-        context[:author] != author && author.comments_notifications?
-      end
-
-      # Public: Overrides the `users_to_notify` Notifiable concern method.
-      def users_to_notify
-        return Decidim::Admin::ProcessAdmins.for(feature.participatory_process) if official?
-        [author]
-      end
     end
   end
 end

data/app/views/decidim/proposals/admin/proposals/_form.html.erb

@@ -24,9 +24,9 @@
       </div>
     <% end %>
 
-    <% if current_participatory_process.has_subscopes? %>
+    <% if current_participatory_space.has_subscopes? %>
       <div class="row column">
-        <%= form.scopes_select :scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_process.scope) %>
+        <%= form.scopes_select :scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_space.scope) %>
       </div>
     <% end %>
 

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

@@ -5,7 +5,7 @@
 
       <div class="button--title">
 
-        <% if feature_settings.official_proposals_enabled %>
+        <% if can? :create, Decidim::Proposals::Proposal %>
           <%= link_to t("actions.new", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposal_path, class: 'button tiny button--simple' if can? :manage, current_feature %>
         <% end %>
 
@@ -19,9 +19,10 @@
       <table class="table-list">
         <thead>
           <tr>
+            <th><%= t("models.proposal.fields.id", scope: "decidim.proposals") %></th>
             <th><%= t("models.proposal.fields.title", scope: "decidim.proposals") %></th>
             <th><%= t("models.proposal.fields.category", scope: "decidim.proposals") %></th>
-            <% if scopes_enabled?(current_participatory_process) %>
+            <% if scopes_enabled?(current_participatory_space) %>
               <th><%= t("models.proposal.fields.scope", scope: "decidim.proposals") %></th>
             <% end %>
             <th><%= t("models.proposal.fields.state", scope: "decidim.proposals") %></th>
@@ -31,6 +32,9 @@
         <tbody>
           <% proposals.each do |proposal| %>
             <tr data-id="<%= proposal.id %>">
+              <td>
+                <%= proposal.id %><br />
+              </td>
               <td>
                 <%= proposal.title %><br />
               </td>
@@ -39,7 +43,7 @@
                   <%= translated_attribute proposal.category.name %>
                 <% end %>
               </td>
-              <% if scopes_enabled?(current_participatory_process) %>
+              <% if scopes_enabled?(current_participatory_space) %>
                 <td>
                   <% if proposal.scope %>
                     <%= translated_attribute proposal.scope.name %>

data/app/views/decidim/proposals/proposals/_filters.html.erb

@@ -28,8 +28,8 @@
     <%= form.collection_check_boxes :activity, [["voted", t('.voted')]], :first, :last, legend_title: t('.activity') %>
   <% end %>
 
-  <% if current_participatory_process.has_subscopes? %>
-    <%= form.scopes_select :scope_id, legend_title: t(".scopes"), label: false, prompt: t('.scope_prompt'), remote_path: decidim.scopes_search_path(root: current_participatory_process.scope, include_root: true), multiple: true %>
+  <% if current_participatory_space.has_subscopes? %>
+    <%= form.scopes_select :scope_id, legend_title: t(".scopes"), label: false, prompt: t('.scope_prompt'), remote_path: decidim.scopes_search_path(root: current_participatory_space.scope, include_root: true), multiple: true %>
   <% end %>
 
   <% if current_feature.categories.any? %>

data/app/views/decidim/proposals/proposals/new.html.erb

@@ -38,9 +38,9 @@
             </div>
           <% end %>
 
-          <% if current_participatory_process.has_subscopes? %>
+          <% if current_participatory_space.has_subscopes? %>
             <div class="field">
-              <%= form.scopes_select :scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_process.scope) %>
+              <%= form.scopes_select :scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_space.scope) %>
             </div>
           <% end %>
 

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

@@ -18,11 +18,12 @@
 </div>
 <div class="row">
   <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
-    <% if current_settings.votes_enabled? %>
+    <% if current_settings.votes_enabled? || current_user %>
       <div class="card extra">
         <div class="card__content">
           <%= render partial: "votes_count", locals: { proposal: @proposal, from_proposals_list: false } %>
           <%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } %>
+          <%= render partial: "decidim/shared/follow_button", locals: { followable: @proposal } %>
         </div>
       </div>
     <% end %>

data/config/locales/ca.yml

@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -18,12 +19,16 @@ ca:
         name: Propostes
         settings:
           global:
+            announcement: Avís
+            attachments_allowed: Permetre arxius adjunts
             comments_enabled: Comentaris habilitats
             geocoding_enabled: Geocodificació habilitada
+            new_proposal_help_text: Text d'ajuda al crear una nova proposta
             official_proposals_enabled: Propostes oficials habilitades
             proposal_answering_enabled: Resposta oficial a propostes activades
             vote_limit: Límit de vot
           step:
+            announcement: Avís
             comments_blocked: Comentaris bloquejats
             creation_enabled: Habilitar de creació de propostes
             proposal_answering_enabled: Resposta oficial a propostes activades
@@ -59,6 +64,7 @@ ca:
             invalid: Hi ha hagut un problema en crear aquesta proposta
             success: Proposta creada correctament
           form:
+            attachment_legend: "(Opcional) Afegiu un fitxer adjunt"
             select_a_category: Selecciona una categoria
           index:
             title: Propostes
@@ -77,6 +83,7 @@ ca:
         proposal:
           fields:
             category: Categoria
+            id: ID
             official_proposal: Proposta oficial
             scope: Àmbit
             state: Estat
@@ -122,6 +129,7 @@ ca:
             one: <span class="card--list__data__number">1</span>suport
             other: <span class="card--list__data__number">%{count}</span>suports
         new:
+          attachment_legend: "(Opcional) Afegiu un fitxer adjunt"
           back: Enrere
           select_a_category: Si us plau, seleccioni una categoria
           send: Enviar
@@ -156,5 +164,3 @@ ca:
       included_proposals:
         proposal_projects: 'Proposta formulada en aquests projectes:'
         proposal_results: 'La proposta apareix en aquests resultats:'
-      proposals_from_meeting:
-        proposal_meetings: Trobades relacionades

data/config/locales/en.yml

@@ -34,8 +34,7 @@ en:
             proposal_answering_enabled: Proposal answering enabled
             votes_blocked: Votes blocked
             votes_enabled: Votes enabled
-            votes_hidden: Votes hidden (if votes are enabled, checking this will hide
-              the number of votes)
+            votes_hidden: Votes hidden (if votes are enabled, checking this will hide the number of votes)
     proposals:
       actions:
         answer: Answer
@@ -84,6 +83,7 @@ en:
         proposal:
           fields:
             category: Category
+            id: ID
             official_proposal: Official proposal
             scope: Scope
             state: State
@@ -156,8 +156,7 @@ en:
             other: VOTES
         votes_limit:
           vote_limit:
-            description: Instead of voting as many proposals as you want you can only
-              vote up to %{limit} proposals.
+            description: Instead of voting as many proposals as you want you can only vote up to %{limit} proposals.
             left: Remaining
             title: You have %{limit} votes to distribute
             votes: Votes
@@ -165,5 +164,3 @@ en:
       included_proposals:
         proposal_projects: 'Proposal appearing in these projects:'
         proposal_results: 'Proposal appearing in these results:'
-      proposals_from_meeting:
-        proposal_meetings: Related meetings

data/config/locales/es.yml

@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -18,12 +19,16 @@ es:
         name: Propuestas
         settings:
           global:
+            announcement: Aviso
+            attachments_allowed: Permitir archivos adjuntos
             comments_enabled: Comentarios habilitados
             geocoding_enabled: Geocodificación habilitada
+            new_proposal_help_text: Texto de ayuda al crear una propuesta
             official_proposals_enabled: Propuestas oficiales habilitadas
             proposal_answering_enabled: Respuesta oficial a propuestas habilitadas
             vote_limit: Límite de votos
           step:
+            announcement: Aviso
             comments_blocked: Comentarios bloqueados
             creation_enabled: Habilitar creación de propuestas
             proposal_answering_enabled: Respuesta a propuestas activadas
@@ -59,6 +64,7 @@ es:
             invalid: Ha habido un problema al crear esta propuesta
             success: Propuesta creada correctamente
           form:
+            attachment_legend: "(Opcional) Añadir un archivo adjunto"
             select_a_category: Seleccione una categoría
           index:
             title: Propuestas
@@ -77,6 +83,7 @@ es:
         proposal:
           fields:
             category: Categoría
+            id: Identificador
             official_proposal: Propuesta oficial
             scope: Ámbito
             state: Estado
@@ -122,6 +129,7 @@ es:
             one: <span class="card--list__data__number">1</span>vote
             other: <span class="card--list__data__number">%{count}</span>votos
         new:
+          attachment_legend: "(Opcional) Añadir un archivo adjunto"
           back: Atrás
           select_a_category: Por favor, seleccione una categoría
           send: Enviar
@@ -156,5 +164,3 @@ es:
       included_proposals:
         proposal_projects: 'Propuesta formulada en estos proyectos:'
         proposal_results: 'Propuesta formulada en estos resultados:'
-      proposals_from_meeting:
-        proposal_meetings: Encuentros relacionados

data/config/locales/eu.yml

@@ -5,7 +5,7 @@ eu:
         body: Testua
         category_id: Kategoria
         scope_id: Esparrua
-        title: Izenburua
+        title: Titulua
         user_group_id: 'Sortu proposamen bat honako hau gisa:'
       proposal_answer:
         answer: Erantzuna
@@ -18,15 +18,19 @@ eu:
         name: Proposamenak
         settings:
           global:
+            announcement: Oharra
+            attachments_allowed: Onartu eranskinak
             comments_enabled: Iruzkinak gaituta
             geocoding_enabled: Geokodeketa gaituta
+            new_proposal_help_text: Proposamen berriaren laguntza testu
             official_proposals_enabled: Proposamen ofizialak gaituta
-            proposal_answering_enabled: Erantzun ofiziala gaitutako proposamenei
+            proposal_answering_enabled: Erantzuna aktibatutako proposamenei
             vote_limit: Boto-muga
           step:
+            announcement: Oharra
             comments_blocked: Iruzkinak blokeatuta
             creation_enabled: Gaitu proposamenen sorrera
-            proposal_answering_enabled: Erantzuna aktibatutako proposamenei
+            proposal_answering_enabled: Erantzun ofiziala gaitutako proposamenei
             votes_blocked: Bozketa blokeatuta
             votes_enabled: Botoak gaituta
             votes_hidden: Boto ezkutuak (Botoak gaituta egon eta aukera hau markatuz gero, ezkutuan geldituko da botoen kopurua)
@@ -48,7 +52,8 @@ eu:
           edit:
             accepted: Onartuta
             answer_proposal: Erantzuna
-            rejected: Baztertuta
+            evaluating: ebaluatzea
+            rejected: Ukatua
             title: 'Erantzun proposamen honi: %{title}'
         proposals:
           answer:
@@ -58,6 +63,7 @@ eu:
             invalid: Arazo bat izan da proposamen hau sortzean.
             success: Proposamena zuzen sortu da.
           form:
+            attachment_legend: "(Aukerakoa) Gehitu eranskina"
             select_a_category: Aukeratu kategoria bat
           index:
             title: Proposamenak
@@ -66,8 +72,9 @@ eu:
             title: Sortu proposamena
       answers:
         accepted: Onartuta
+        evaluating: ebaluatzea
         not_answered: Erantzun gabe
-        rejected: Baztertuta
+        rejected: Ukatua
       create:
         error: Erroreak gertatu dira proposamena gordetzean.
         success: Proposamena zuzen sortu da.
@@ -75,11 +82,18 @@ eu:
         proposal:
           fields:
             category: Kategoria
+            id: NAN
             official_proposal: Proposamen ofiziala
             scope: Esparrua
             state: Egoera
-            title: Izenburua
+            title: Titulua
+      proposal_votes:
+        create:
+          error: Ez da izan, akats denean proposamena bozkatzea.
       proposals:
+        author:
+          deleted: Erabiltzaile ezabatua
+          verified_user_group: Egiaztatutako erakundea
         count:
           proposals_count:
             one: 1 proposamen
@@ -91,10 +105,12 @@ eu:
           category: Kategoria
           category_prompt: Aukeratu kategoria bat
           citizenship: Herritarrak
+          evaluating: ebaluatzea
           official: Ofiziala
           origin: Jatorria
-          rejected: Baztertuta
+          rejected: Ukatua
           related_to: Honekin lotuta
+          scope_prompt: Hautatu esparrua
           scopes: Esparruak
           search: Bilatu
           state: Egoera
@@ -112,6 +128,7 @@ eu:
             one: <span class="card--list__data__number">1</span>boto
             other: <span class="card--list__data__number">%{count}</span>boto
         new:
+          attachment_legend: "(Aukerakoa) Gehitu eranskina"
           back: Atzera
           select_a_category: Mesedez, aukeratu kategoria bat
           send: Bidali
@@ -121,6 +138,8 @@ eu:
           most_voted: Bozkatuenak
           random: Ausazkoa eran
           recent: Berrienak
+        proposal:
+          view_proposal: Ikusi proposamena
         show:
           proposal_accepted_reason: 'Proposamen hau onartu da arrazoi hauengatik:'
           proposal_rejected_reason: 'Proposamen hau baztertu da arrazoi hauengatik:'
@@ -144,5 +163,3 @@ eu:
       included_proposals:
         proposal_projects: 'Proiektu hauetatik sortutako proposamena:'
         proposal_results: 'Emaitza hauetatik sortutako proposamena:'
-      proposals_from_meeting:
-        proposal_meetings: Proposamenarekin lotutako topaketak

data/config/locales/fi.yml

@@ -13,32 +13,46 @@ fi:
     features:
       proposals:
         actions:
+          create: Luo
           vote: Äänestä
         name: Ehdotukset
         settings:
           global:
+            announcement: Ilmoitus
+            attachments_allowed: Salli liitteet
             comments_enabled: Kommentointi sallittu
             geocoding_enabled: Geokoodaus päällä
+            new_proposal_help_text: Uuden ehdotuksen ohjeteksti
             official_proposals_enabled: Viralliset ehdotukset sallittu
             proposal_answering_enabled: Ehdotuksiin vastaaminen sallittu
             vote_limit: Äänestysrajoite
           step:
+            announcement: Ilmoitus
             comments_blocked: Kommentointi estetty
             creation_enabled: Ehdotusten luonti sallittu
             proposal_answering_enabled: Ehdotuksiin vastaaminen sallittu
             votes_blocked: Äänestys estetty
             votes_enabled: Äänestys sallittu
+            votes_hidden: Äänten määrä piilotettu (jos äänestys on käytössä, äänten määrä piilotetaan valitsemalla tämä)
     proposals:
       actions:
         answer: Vastaa
+        new: Uusi
         title: Toiminnot
       admin:
+        actions:
+          preview: Esikatsele
+        exports:
+          comments: Kommentit
+          proposals: Ehdotukset
         models:
           proposal:
             name: Ehdotus
         proposal_answers:
           edit:
             accepted: Hyväksytty
+            answer_proposal: Vastaa
+            evaluating: Arvioitavana
             rejected: Hylätty
             title: 'Vastaa ehdotukseen: %{title}'
         proposals:
@@ -49,11 +63,16 @@ fi:
             invalid: Ehdotuksen luonnissa tapahtui virhe
             success: Ehdotus luotu onnistuneesti
           form:
+            attachment_legend: "(Valinnainen) Lisää liite"
             select_a_category: Valitse kategoria
           index:
             title: Ehdotukset
+          new:
+            create: Luo
+            title: Luo ehdotus
       answers:
         accepted: Hyväksytty
+        evaluating: Arvioitavana
         not_answered: Vastaamaton
         rejected: Hylätty
       create:
@@ -63,11 +82,18 @@ fi:
         proposal:
           fields:
             category: Kategoria
+            id: ID
             official_proposal: Virallinen ehdotus
             scope: Konteksti
             state: Tila
             title: Otsikko
+      proposal_votes:
+        create:
+          error: Äänestettäessä ehdotusta tapahtui virhe.
       proposals:
+        author:
+          deleted: Poistettu käyttäjä
+          verified_user_group: Vahvistettu organisaatio
         count:
           proposals_count:
             one: 1 ehdotus
@@ -77,11 +103,14 @@ fi:
           activity: Aktiivisuus
           all: Kaikki
           category: Kategoria
+          category_prompt: Valitse kategoria
           citizenship: Kansalaisuus
+          evaluating: Arvioitavana
           official: Virallinen
           origin: Alkuperä
           rejected: Hylätty
           related_to: Liittyy aiheeseen
+          scope_prompt: Valitse konteksti
           scopes: Kontekstit
           search: Haku
           state: Tila
@@ -99,6 +128,7 @@ fi:
             one: <span class="card--list__data__number">1</span>ääni
             other: <span class="card--list__data__number">%{count}</span>ääntä
         new:
+          attachment_legend: "(Valinnainen) Lisää liite"
           back: Takaisin
           select_a_category: Valitse kategoria
           send: Lähetä
@@ -108,6 +138,8 @@ fi:
           most_voted: Eniten ääniä saaneet
           random: Satunnainen
           recent: Viimeisimmät
+        proposal:
+          view_proposal: Näytä ehdotus
         show:
           proposal_accepted_reason: 'Tämä ehdotus on hyväksytty, koska:'
           proposal_rejected_reason: 'Tämä ehdotus on hylätty, koska:'
@@ -131,5 +163,3 @@ fi:
       included_proposals:
         proposal_projects: 'Ehdotus esiintyy näissä projekteissa:'
         proposal_results: 'Ehdotus esiintyy näissä tuloksissa:'
-      proposals_from_meeting:
-        proposal_meetings: Liittyvät tapaamiset