decidim-proposals 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f13d0ef861e66c1e95a6124cc9242d4447e43b09b80da02464f9e7377d80a7ac
-  data.tar.gz: 6b078a6ebd4448035a6396c89d7df02bb7abdb67e24acb964a627f0f3a9948b2
+  metadata.gz: cd92d9a86bbb41cef36be401939e82e78daf2e9ec8d7dea07921a0b4343e2f01
+  data.tar.gz: 55d68437c2d85ce6e97ba5e89756edb01659ca855392c74cee06545c77bd39fa
 SHA512:
-  metadata.gz: 59a0b46773f45a0192cc760ad3507480d120f48b3052f1dd59b60c4c631614d9a128bd349c2923ee30e50ebff4439174f436cb4ab7496949f8287432f89c9b73
-  data.tar.gz: e5fdead624f1af2782d81874ce3c0d5c53f0e0b775bdec647250fced81aff03d447e7a0d7c602832dc885728f96bb4a2898e1eb7c2ec7cf03fef3a4963c50e86
+  metadata.gz: 48fcf93dd3442df4dedba922c14e9dfb7a4a98b0c48edce15a19eaf0a6bd811b63b6a233dddf4385deef4a5424ff9c61975e579ccf367b89b798e2b980c1c798
+  data.tar.gz: 1a853edd8aa360ffba5732d77aea004da8450a4c097289db4fcf9398b8754d7bbbff1ab3c137a141ef2183a3e8373dbe495cd20731bbb1e878ac69626f243f13

data/app/controllers/concerns/decidim/proposals/orderable.rb

@@ -18,6 +18,9 @@ module Decidim
           @available_orders ||= begin
             available_orders = %w(random recent)
             available_orders << "most_voted" if most_voted_order_available?
+            available_orders << "most_endorsed" if current_settings.endorsements_enabled?
+            available_orders << "most_commented" if component_settings.comments_enabled?
+            available_orders << "most_followed" << "with_more_authors"
             available_orders
           end
         end
@@ -40,12 +43,20 @@ module Decidim
 
         def reorder(proposals)
           case order
-          when "random"
-            proposals.order_randomly(random_seed)
+          when "most_commented"
+            proposals.left_joins(:comments).group(:id).order(Arel.sql("COUNT(decidim_comments_comments.id) DESC"))
+          when "most_endorsed"
+            proposals.order(proposal_endorsements_count: :desc)
+          when "most_followed"
+            proposals.left_joins(:follows).group(:id).order(Arel.sql("COUNT(decidim_follows.id) DESC"))
           when "most_voted"
             proposals.order(proposal_votes_count: :desc)
+          when "random"
+            proposals.order_randomly(random_seed)
           when "recent"
             proposals.order(published_at: :desc)
+          when "with_more_authors"
+            proposals.order(coauthorships_count: :desc)
           end
         end
       end

data/app/controllers/decidim/proposals/proposals_controller.rb

@@ -213,7 +213,7 @@ module Decidim
         {
           search_text: "",
           origin: "all",
-          activity: "",
+          activity: "all",
           category_id: "",
           state: "except_rejected",
           scope_id: nil,

data/app/helpers/decidim/proposals/application_helper.rb

@@ -157,6 +157,16 @@ module Decidim
           ["amendments", t("decidim.proposals.application_helper.filter_type_values.amendments")]
         ]
       end
+
+      # Options to filter Proposals by activity.
+      def activity_filter_values
+        base = [
+          ["all", t(".all")],
+          ["my_proposals", t(".my_proposals")]
+        ]
+        base += [["voted", t(".voted")]] if current_settings.votes_enabled?
+        base
+      end
     end
   end
 end

data/app/helpers/decidim/proposals/proposals_helper.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # Simple helpers to handle markup variations for proposals
+    module ProposalsHelper
+      def proposal_reason_callout_args
+        {
+          announcement: {
+            title: proposal_reason_callout_title,
+            body: decidim_sanitize(translated_attribute(@proposal.answer))
+          },
+          callout_class: proposal_reason_callout_class
+        }
+      end
+
+      def proposal_reason_callout_class
+        case @proposal.state
+        when "accepted"
+          "success"
+        when "evaluating"
+          "warning"
+        when "rejected"
+          "alert"
+        else
+          ""
+        end
+      end
+
+      def proposal_reason_callout_title
+        i18n_key = case @proposal.state
+                   when "evaluating"
+                     "proposal_in_evaluation_reason"
+                   else
+                     "proposal_#{@proposal.state}_reason"
+                   end
+
+        t(i18n_key, scope: "decidim.proposals.proposals.show")
+      end
+    end
+  end
+end

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

@@ -56,6 +56,7 @@ module Decidim
       scope :except_rejected, -> { where.not(state: "rejected").or(where(state: nil)) }
       scope :except_withdrawn, -> { where.not(state: "withdrawn").or(where(state: nil)) }
       scope :drafts, -> { where(published_at: nil) }
+      scope :except_drafts, -> { where.not(published_at: nil) }
       scope :published, -> { where.not(published_at: nil) }
 
       acts_as_list scope: :decidim_component_id

data/app/presenters/decidim/proposals/proposal_presenter.rb

@@ -16,13 +16,7 @@ module Decidim
                       Decidim::Proposals::OfficialAuthorPresenter.new
                     else
                       coauthorship = coauthorships.first
-                      if coauthorship.user_group
-                        Decidim::UserGroupPresenter.new(coauthorship.user_group)
-                      elsif coauthorship.author.is_a?(Decidim::User)
-                        Decidim::UserPresenter.new(coauthorship.author)
-                      elsif coauthorship.author.is_a?(Decidim::Meeting)
-                        Decidim::MeetingPresenter.new(coauthorship.author)
-                      end
+                      coauthorship.user_group&.presenter || coauthorship.author.presenter
                     end
       end
 

data/app/services/decidim/proposals/proposal_search.rb

@@ -53,13 +53,18 @@ module Decidim
 
       # Handle the activity filter
       def search_activity
-        if activity.include? "voted"
+        case activity
+        when "voted"
           query
             .includes(:votes)
-            .where(decidim_proposals_proposal_votes: {
-                     decidim_author_id: options[:current_user]
-                   })
-        else
+            .where(decidim_proposals_proposal_votes: { decidim_author_id: @current_user })
+        when "my_proposals"
+          query
+            .where.not(coauthorships_count: 0)
+            .joins(:coauthorships)
+            .where(decidim_coauthorships: { decidim_author_type: "Decidim::UserBaseEntity" })
+            .where(decidim_coauthorships: { decidim_author_id: @current_user })
+        else # Assume 'all'
           query
         end
       end

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

@@ -28,8 +28,8 @@
     <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Proposals::Proposal), :first, :last, legend_title: t(".related_to") %>
   <% end %>
 
-  <% if current_user && current_settings.votes_enabled? %>
-    <%= form.collection_check_boxes :activity, [["voted", t(".voted")]], :first, :last, legend_title: t(".activity") %>
+  <% if current_user %>
+    <%= form.collection_radio_buttons :activity, activity_filter_values, :first, :last, legend_title: t(".activity") %>
   <% end %>
 
   <% if current_participatory_space.has_subscopes? %>

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

@@ -34,7 +34,7 @@
       <%= render partial: "count" %>
     </h2>
     <% if current_settings.creation_enabled && current_component.participatory_space.can_participate?(current_user) %>
-      <%= action_authorized_link_to :create, new_proposal_path, class: "title-action__action button small hollow", data: { "redirect_url" => new_proposal_path } do %>
+      <%= action_authorized_link_to :create, new_proposal_path, class: "title-action__action button small", data: { "redirect_url" => new_proposal_path } do %>
         <%= t(".new_proposal") %>
         <%= icon "plus" %>
       <% end %>

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

@@ -108,30 +108,9 @@ edit_link(
       <% end %>
       <%= cell "decidim/proposals/proposal_tags", @proposal %>
     </div>
-    <% if @proposal.answered? && translated_attribute(@proposal.answer).present? %>
-      <% if @proposal.accepted? %>
-        <div class="section">
-          <div class="callout success">
-            <h5><%= t(".proposal_accepted_reason") %></h5>
-            <p><%= decidim_sanitize translated_attribute @proposal.answer %></p>
-          </div>
-        </div>
-      <% elsif @proposal.rejected? %>
-        <div class="section">
-          <div class="callout warning">
-            <h5><%= t(".proposal_rejected_reason") %></h5>
-            <p><%= decidim_sanitize translated_attribute @proposal.answer %></p>
-          </div>
-        </div>
-      <% else %>
-        <div class="section">
-          <div class="callout secondary">
-            <h5><%= t(".proposal_in_evaluation_reason") %></h5>
-            <p><%= decidim_sanitize translated_attribute @proposal.answer %></p>
-          </div>
-        </div>
-      <% end %>
-    <% end %>
+
+    <%= cell("decidim/announcement", proposal_reason_callout_args) if @proposal.answered? %>
+
     <%= linked_resources_for @proposal, :results, "included_proposals" %>
     <%= linked_resources_for @proposal, :projects, "included_proposals" %>
     <%= linked_resources_for @proposal, :meetings, "proposals_from_meeting" %>

data/config/locales/ar.yml

@@ -18,7 +18,6 @@ ar:
         body: الجسم
         category_id: الفئة
         has_address: لديه عنوان
-        scope_id: نطاق
         state: حالة
         suggested_hashtags: الهاشتاج المقترحة
         title: عنوان
@@ -647,7 +646,6 @@ ar:
         endorsements_card_row:
           comments: تعليقات
         filters:
-          activity: نشاط
           amendment_type: نوع
           category: الفئة
           category_prompt: اختر تصنيف

data/config/locales/ca.yml

@@ -17,8 +17,8 @@ ca:
         automatic_hashtags: Hashtags afegits automàticament
         body: Cos
         category_id: Categoria
+        decidim_scope_id: Àmbit
         has_address: Té adreça
-        scope_id: Àmbit
         state: Estat
         suggested_hashtags: Hashtags suggerits
         title: Títol
@@ -644,10 +644,12 @@ ca:
         endorsements_card_row:
           comments: Comentaris
         filters:
-          activity: Activitat
+          activity: La meva activitat
+          all: Tots
           amendment_type: Tipus
           category: Categoria
           category_prompt: Selecciona una categoria
+          my_proposals: Les meves propostes
           origin: Origen
           related_to: Relacionat amb
           search: Cerca
@@ -672,9 +674,13 @@ ca:
           title: Crea la teva proposta
         orders:
           label: 'Ordenar propostes per:'
+          most_commented: Més comentats
+          most_endorsed: Més recolzats
+          most_followed: Més seguits
           most_voted: Amb més suports
           random: Aleatori
           recent: Recent
+          with_more_authors: Amb més autors
         participatory_texts:
           index:
             document_index: Índex del document

data/config/locales/cs.yml

@@ -18,7 +18,6 @@ cs:
         body: Tělo
         category_id: Kategorie
         has_address: Má adresu
-        scope_id: Rozsah
         state: Stát
         suggested_hashtags: Navrhované hashtags
         title: Titul
@@ -660,7 +659,6 @@ cs:
         endorsements_card_row:
           comments: Komentáře
         filters:
-          activity: Aktivita
           amendment_type: Typ
           category: Kategorie
           category_prompt: Vyberte kategorii

data/config/locales/de.yml

@@ -18,7 +18,6 @@ de:
         body: Karosserie
         category_id: Kategorie
         has_address: Hat eine Adresse
-        scope_id: Umfang
         state: Zustand
         suggested_hashtags: Vorgeschlagene Hashtags
         title: Titel
@@ -631,7 +630,6 @@ de:
         endorsements_card_row:
           comments: Bemerkungen
         filters:
-          activity: Aktivität
           amendment_type: Art
           category: Kategorie
           category_prompt: Wählen Sie eine Kategorie

data/config/locales/en.yml

@@ -18,8 +18,8 @@ en:
         automatic_hashtags: Hashtags automatically added
         body: Body
         category_id: Category
+        decidim_scope_id: Scope
         has_address: Has address
-        scope_id: Scope
         state: State
         suggested_hashtags: Suggested hashtags
         title: Title
@@ -539,7 +539,7 @@ en:
           hidden_authors_count:
             one: and %{count} more person
             other: and %{count} more people
-          info-message: This is a <strong>collaborative draft</strong> for a proposal. This means that you can help their authors to shape the proposal using the comment section below or improve it directly by requesting access to edit it. Once the authors grant you access, youl'll be able to make changes to this draft.
+          info-message: This is a <strong>collaborative draft</strong> for a proposal. This means that you can help their authors to shape the proposal using the comment section below or improve it directly by requesting access to edit it. Once the authors grant you access, you'll be able to make changes to this draft.
           of_versions: "(of %{number})"
           publish: Publish
           publish_info: Publish this version of the draft or
@@ -645,10 +645,12 @@ en:
         endorsements_card_row:
           comments: Comments
         filters:
-          activity: Activity
+          activity: My activity
+          all: All
           amendment_type: Type
           category: Category
           category_prompt: Select a category
+          my_proposals: My proposals
           origin: Origin
           related_to: Related to
           search: Search
@@ -673,9 +675,13 @@ en:
           title: Create Your Proposal
         orders:
           label: 'Order proposals by:'
+          most_commented: Most commented
+          most_endorsed: Most endorsed
+          most_followed: Most followed
           most_voted: Most supported
           random: Random
           recent: Recent
+          with_more_authors: With more authors
         participatory_texts:
           index:
             document_index: Document index

data/config/locales/es-MX.yml

@@ -18,7 +18,6 @@ es-MX:
         body: Cuerpo
         category_id: Categoría
         has_address: Tiene dirección
-        scope_id: Ámbito
         state: Estado
         suggested_hashtags: Hashtags sugeridos
         title: Título
@@ -644,7 +643,6 @@ es-MX:
         endorsements_card_row:
           comments: Comentarios
         filters:
-          activity: Actividad
           amendment_type: Tipo
           category: Categoría
           category_prompt: Selecciona una categoría

data/config/locales/es-PY.yml

@@ -18,7 +18,6 @@ es-PY:
         body: Cuerpo
         category_id: Categoría
         has_address: Tiene dirección
-        scope_id: Ámbito
         state: Estado
         suggested_hashtags: Hashtags sugeridos
         title: Título
@@ -644,7 +643,6 @@ es-PY:
         endorsements_card_row:
           comments: Comentarios
         filters:
-          activity: Actividad
           amendment_type: Tipo
           category: Categoría
           category_prompt: Selecciona una categoría

data/config/locales/es.yml

@@ -18,7 +18,6 @@ es:
         body: Cuerpo
         category_id: Categoría
         has_address: Tiene dirección
-        scope_id: Ámbito
         state: Estado
         suggested_hashtags: Hashtags sugeridos
         title: Título
@@ -644,7 +643,6 @@ es:
         endorsements_card_row:
           comments: Comentarios
         filters:
-          activity: Actividad
           amendment_type: Tipo
           category: Categoría
           category_prompt: Selecciona una categoría

data/config/locales/eu.yml

@@ -18,7 +18,6 @@ eu:
         body: Testua
         category_id: Kategoria
         has_address: Helbidea du
-        scope_id: Esparrua
         state: Estatu
         suggested_hashtags: Iradokitako hashtagak
         title: Titulua
@@ -629,7 +628,6 @@ eu:
         endorsements_card_row:
           comments: Oharrak
         filters:
-          activity: Jarduera
           amendment_type: Mota
           category: Kategoria
           category_prompt: Aukeratu kategoria bat

data/config/locales/fi-plain.yml

@@ -17,8 +17,8 @@ fi-pl:
         automatic_hashtags: Hashtagit lisätty automaattisesti
         body: Ehdotuksen kuvaus
         category_id: Aihepiiri
+        decidim_scope_id: Teema
         has_address: Ehdotuksella on sijainti
-        scope_id: Teema
         state: Tila
         suggested_hashtags: Ehdotetut hashtagit
         title: Ehdotuksen nimi
@@ -644,10 +644,12 @@ fi-pl:
         endorsements_card_row:
           comments: Kommentit
         filters:
-          activity: Aktiivisuus
+          activity: Oma toiminta
+          all: Kaikki
           amendment_type: Tyyppi
           category: Aihepiiri
           category_prompt: Valitse aihepiiri
+          my_proposals: Omat ehdotukset
           origin: Alkuperä
           related_to: Liittyy aiheeseen
           search: Haku
@@ -672,9 +674,13 @@ fi-pl:
           title: Luo ehdotuksesi
         orders:
           label: 'Järjestä ehdotukset:'
+          most_commented: Eniten kommentoidut
+          most_endorsed: Eniten suositellut
+          most_followed: Eniten seuratut
           most_voted: Eniten ääniä saaneet
           random: Satunnainen
           recent: Viimeisimmät
+          with_more_authors: Eniten laatijoita
         participatory_texts:
           index:
             document_index: Asiakirjan hakemisto

data/config/locales/fi.yml

@@ -17,8 +17,8 @@ fi:
         automatic_hashtags: Hashtagit lisätty automaattisesti
         body: Ehdotuksen kuvaus
         category_id: Aihepiiri
+        decidim_scope_id: Teema
         has_address: Ehdotuksella on sijainti
-        scope_id: Teema
         state: Tila
         suggested_hashtags: Ehdotetut hashtagit
         title: Ehdotuksen nimi
@@ -644,10 +644,12 @@ fi:
         endorsements_card_row:
           comments: Kommentit
         filters:
-          activity: Aktiivisuus
+          activity: Oma toiminta
+          all: Kaikki
           amendment_type: Tyyppi
           category: Aihepiiri
           category_prompt: Valitse aihepiiri
+          my_proposals: Omat ehdotukset
           origin: Alkuperä
           related_to: Liittyy aiheeseen
           search: Haku
@@ -672,9 +674,13 @@ fi:
           title: Luo ehdotuksesi
         orders:
           label: 'Järjestä ehdotukset:'
+          most_commented: Eniten kommentoidut
+          most_endorsed: Eniten suositellut
+          most_followed: Eniten seuratut
           most_voted: Eniten kannatuksia saaneet
           random: Satunnainen
           recent: Viimeisimmät
+          with_more_authors: Eniten laatijoita
         participatory_texts:
           index:
             document_index: Asiakirjan hakemisto

data/config/locales/fr.yml

@@ -18,7 +18,6 @@ fr:
         body: Corps du texte
         category_id: Catégorie
         has_address: Renseigner une adresse
-        scope_id: Périmètre d'application
         state: État
         suggested_hashtags: Hashtags suggérés
         title: Titre
@@ -644,7 +643,6 @@ fr:
         endorsements_card_row:
           comments: Commentaires
         filters:
-          activity: Activité
           amendment_type: Type
           category: Catégorie
           category_prompt: Sélectionner une catégorie

data/config/locales/gl.yml

@@ -18,7 +18,6 @@ gl:
         body: Corpo
         category_id: Categoría
         has_address: Ten enderezo
-        scope_id: Alcance
         state: Estado
         suggested_hashtags: Hashtags suxeridos
         title: Título
@@ -629,7 +628,6 @@ gl:
         endorsements_card_row:
           comments: Comentarios
         filters:
-          activity: Actividade
           amendment_type: Tipo
           category: Categoría
           category_prompt: Selecciona unha categoría

data/config/locales/hu.yml

@@ -17,8 +17,8 @@ hu:
         automatic_hashtags: Hashtagek automatikusan hozzáadva
         body: Szöveg
         category_id: Kategória
+        decidim_scope_id: Hatáskör
         has_address: Van lakcíme
-        scope_id: Hatáskör
         state: Állapot
         suggested_hashtags: Javasolt hashtagek
         title: Cím
@@ -644,10 +644,12 @@ hu:
         endorsements_card_row:
           comments: Hozzászólások
         filters:
-          activity: Tevékenység
+          activity: Tevékenységeim
+          all: Összes
           amendment_type: Típus
           category: Kategória
           category_prompt: Válassz kategóriát
+          my_proposals: Javaslataim
           origin: Kiindulópont
           related_to: Kapcsolódó
           search: Keresés
@@ -672,9 +674,13 @@ hu:
           title: Hozz létre javaslatot
         orders:
           label: 'Javaslatok rendezése:'
+          most_commented: Legkommentáltabb
+          most_endorsed: Legtámogatottabb
+          most_followed: Legkövetettebb
           most_voted: Legtöbb szavazattal
           random: Véletlenszerű
           recent: Legutóbbi
+          with_more_authors: Több szerző
         participatory_texts:
           index:
             document_index: Dokumentum index

data/config/locales/id-ID.yml

@@ -18,7 +18,6 @@ id:
         body: Tubuh
         category_id: Kategori
         has_address: Memiliki alamat
-        scope_id: Cakupan
         state: Negara
         suggested_hashtags: Tagar yang disarankan
         title: Judul
@@ -621,7 +620,6 @@ id:
         endorsements_card_row:
           comments: Komentar
         filters:
-          activity: Aktivitas
           amendment_type: Mengetik
           category: Kategori
           category_prompt: Pilih Kategori

data/config/locales/it.yml

@@ -17,8 +17,8 @@ it:
         automatic_hashtags: Hashtag aggiunti automaticamente
         body: Corpo del testo
         category_id: Categoria
+        decidim_scope_id: Ambito
         has_address: Ha un indirizzo
-        scope_id: Visibilità
         state: Stato
         suggested_hashtags: Hashtag consigliati
         title: Titolo
@@ -644,10 +644,12 @@ it:
         endorsements_card_row:
           comments: Commenti
         filters:
-          activity: Attività
+          activity: La mia attività
+          all: Tutti
           amendment_type: genere
           category: Categoria
           category_prompt: Scegli una categoria
+          my_proposals: Le mie proposte
           origin: Origine
           related_to: Associata a
           search: Cerca
@@ -672,9 +674,13 @@ it:
           title: Crea la tua proposta
         orders:
           label: 'Ordina le proposte per:'
+          most_commented: I più commentati
+          most_endorsed: I più approvati
+          most_followed: I più seguiti
           most_voted: Più votate
           random: A caso
           recent: le più recenti
+          with_more_authors: Con più autori
         participatory_texts:
           index:
             document_index: Indice del documento

data/config/locales/nl.yml

@@ -18,7 +18,6 @@ nl:
         body: Body
         category_id: Categorie
         has_address: Heeft adres
-        scope_id: Scope
         state: Status
         suggested_hashtags: Voorgestelde hashtags
         title: Titel
@@ -644,10 +643,12 @@ nl:
         endorsements_card_row:
           comments: Comments
         filters:
-          activity: Activiteit
+          activity: Mijn activiteit
+          all: Alle
           amendment_type: Type
           category: Categorie
           category_prompt: Kies een categorie
+          my_proposals: Mijn voorstellen
           origin: Oorsprong
           related_to: Gerelateerd aan
           search: Zoeken
@@ -672,9 +673,13 @@ nl:
           title: Maak voorstel aan
         orders:
           label: 'Bestelling sorteren op:'
+          most_commented: Meeste reacties
+          most_endorsed: Meest goedgekeurd
+          most_followed: Meest gevolgd
           most_voted: Meeste stemmen
           random: Willekeurig
           recent: Meest recent
+          with_more_authors: Met meer auteurs
         participatory_texts:
           index:
             document_index: Documentindex

data/config/locales/no.yml

@@ -201,7 +201,7 @@
         edit_draft:
           discard_confirmation: Er du sikker på at du vil forkaste dette forslaget?
         filters:
-          activity: Aktivitet
+          all: Alle
           category: Kategori
           state: Status
         index:

data/config/locales/pl.yml

@@ -18,7 +18,6 @@ pl:
         body: Ciało
         category_id: Kategoria
         has_address: Ma adres
-        scope_id: Zakres
         state: Stan
         suggested_hashtags: Sugerowane hashtagi
         title: Tytuł
@@ -645,7 +644,6 @@ pl:
         endorsements_card_row:
           comments: Komentarze
         filters:
-          activity: Czynność
           amendment_type: Rodzaj
           category: Kategoria
           category_prompt: Wybierz kategorię

data/config/locales/pt-BR.yml

@@ -18,7 +18,6 @@ pt-BR:
         body: Corpo
         category_id: Categoria
         has_address: Tem endereço
-        scope_id: Âmbito
         state: Estado
         suggested_hashtags: Hashtags sugeridos
         title: Título
@@ -629,7 +628,6 @@ pt-BR:
         endorsements_card_row:
           comments: Comentários
         filters:
-          activity: Atividade
           amendment_type: Tipo
           category: Categoria
           category_prompt: Selecionar uma categoria

data/config/locales/pt.yml

@@ -18,7 +18,6 @@ pt:
         body: Corpo
         category_id: Categoria
         has_address: Tem endereço
-        scope_id: Âmbito
         state: Estado
         suggested_hashtags: Hashtags sugeridos
         title: Título
@@ -629,7 +628,6 @@ pt:
         endorsements_card_row:
           comments: Comentários
         filters:
-          activity: Atividade
           amendment_type: Tipo
           category: Categoria
           category_prompt: Selecione uma categoria

data/config/locales/ru.yml

@@ -7,7 +7,6 @@ ru:
         body: Основной текст
         category_id: Категория
         has_address: Имеет адрес
-        scope_id: Охват
         state: Cостояние
         title: Заголовок
         user_group_id: Создать предложение в качестве
@@ -303,7 +302,6 @@ ru:
         endorsements_card_row:
           comments: Комментарии
         filters:
-          activity: Деятельность
           category: Категория
           category_prompt: Выберите категорию
           origin: Источник

data/config/locales/sv.yml

@@ -18,7 +18,6 @@ sv:
         body: Innehåll
         category_id: Kategori
         has_address: Har adress
-        scope_id: Omfång
         state: Status
         suggested_hashtags: Föreslagna hashtags
         title: Titel
@@ -639,7 +638,6 @@ sv:
         endorsements_card_row:
           comments: Kommentarer
         filters:
-          activity: Aktivitet
           amendment_type: Typ
           category: Kategori
           category_prompt: Välj en kategori

data/config/locales/tr-TR.yml

@@ -18,7 +18,6 @@ tr:
         body: Vücut
         category_id: Kategori
         has_address: Adresi var
-        scope_id: kapsam
         state: Belirtmek, bildirmek
         suggested_hashtags: Önerilen hashtag'ler
         title: Başlık
@@ -635,7 +634,6 @@ tr:
         endorsements_card_row:
           comments: Yorumlar
         filters:
-          activity: Aktivite
           amendment_type: tip
           category: Kategori
           category_prompt: bir kategori seç

data/config/locales/uk.yml

@@ -7,7 +7,6 @@ uk:
         body: Основний текст
         category_id: Категорія
         has_address: Має адресу
-        scope_id: Обсяг
         state: Стан
         title: Назва
         user_group_id: Створити пропозицію як
@@ -303,7 +302,6 @@ uk:
         endorsements_card_row:
           comments: Коментарі
         filters:
-          activity: Діяльність
           category: Категорія
           category_prompt: Оберіть категорію
           origin: Джерело

data/lib/decidim/proposals/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.19.1"
+      "0.20.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -60,28 +60,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -158,84 +158,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -383,6 +383,7 @@ files:
 - app/helpers/decidim/proposals/proposal_endorsements_helper.rb
 - app/helpers/decidim/proposals/proposal_votes_helper.rb
 - app/helpers/decidim/proposals/proposal_wizard_helper.rb
+- app/helpers/decidim/proposals/proposals_helper.rb
 - app/jobs/decidim/proposals/notify_proposals_mentioned_job.rb
 - app/jobs/decidim/proposals/settings_change_job.rb
 - app/models/decidim/proposals/application_record.rb