decidim-debates 0.31.4 → 0.32.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1eda1f098adc2b2adbef1ff80ae8c1ab0b4956f42aa21c8544fea6dfa94f5cd
-  data.tar.gz: a7e979e9b2c6e13ffe407b8a5754351f505399f583b9f59bdf6e82c0cf365be2
+  metadata.gz: 504cf530bc1f11776d3cd5e93cd781f4888762c2b07597dd55f770f31c675707
+  data.tar.gz: a77fff7b61b400f0d2d3bce57683cd0c3c4f8e7872da65151f505f661b2c8ec4
 SHA512:
-  metadata.gz: 395bd2e40f3dadd7d0116fe54cfbd0d9adedd3e8a260bbf8d19b51b2195290fc3a35c36930933b5a3a82986b459ce2676c947043611d368a83af53f8295463a4
-  data.tar.gz: 2cc25a5b1defd53570cb47167df1ca5501421db9d0b36153dc3a6fe8ed51e2e18b944c7e7a780298afd6c59acea80380887778bd1b2afc8faeb11868f45ba575
+  metadata.gz: 7fe7b852e10a54d98c97ae036879737a8cdf9c719f7cfcaee3ba4118fcbe0bc158dc8328c73f0df23e7e69672e446209936e8ec58cc4e634e711bd196b4ba245
+  data.tar.gz: 073e5d311a9649489291335fb94cdd9d6f8734a25adb5c2907830dd2dcb04b4f2751764dedc692baa756e2c2c58980eabc5ae0a78972248389ffd8ee33a0af4f

data/README.md

@@ -1,10 +1,14 @@
-# Decidim::Debates
+# decidim-debates
 
-The Debates module adds debate to any participatory process. It adds a CRUD engine to the admin and public view scoped inside the participatory process.
+The Debates module adds debate to any participatory space. It adds a CRUD engine to the admin and public view scoped inside the participatory space.
 
 ## Usage
 
-Debates will be available as a Component for any participatory space.
+Debates will be available as a Component for any Participatory Space.
+
+## Installation
+
+This is on the default Decidim installation so you should not change anything to use this component.
 
 ## Contributing
 

data/app/cells/decidim/debates/debate_l_cell.rb

@@ -8,6 +8,7 @@ module Decidim
     # for a given instance of a Debate
     class DebateLCell < Decidim::CardLCell
       include Decidim::SanitizeHelper
+
       delegate :component_settings, to: :controller
 
       alias debate model

data/app/commands/decidim/debates/close_debate.rb

@@ -28,6 +28,8 @@ module Decidim
 
       attr_reader :form
 
+      delegate :debate, to: :form
+
       def close_debate
         @debate = Decidim.traceability.perform_action!(
           :close,

data/app/controllers/decidim/debates/admin/debate_closes_controller.rb

@@ -26,7 +26,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("debates.close.invalid", scope: "decidim.debates")
-              render action: "edit", status: :unprocessable_entity
+              render action: "edit", status: :unprocessable_content
             end
           end
         end

data/app/controllers/decidim/debates/admin/debates_controller.rb

@@ -6,6 +6,7 @@ module Decidim
       # This controller allows an admin to manage debates from a Participatory Space
       class DebatesController < Decidim::Debates::Admin::ApplicationController
         include Decidim::Admin::HasTrashableResources
+
         helper Decidim::ApplicationHelper
 
         helper_method :debates
@@ -34,7 +35,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("debates.create.invalid", scope: "decidim.debates.admin")
-              render action: "new", status: :unprocessable_entity
+              render action: "new", status: :unprocessable_content
             end
           end
         end
@@ -57,7 +58,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("debates.update.invalid", scope: "decidim.debates.admin")
-              render action: "edit", status: :unprocessable_entity
+              render action: "edit", status: :unprocessable_content
             end
           end
         end

data/app/controllers/decidim/debates/debates_controller.rb

@@ -35,7 +35,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("debates.create.invalid", scope: "decidim.debates")
-            render action: "new", status: :unprocessable_entity
+            render action: "new", status: :unprocessable_content
           end
         end
       end
@@ -63,7 +63,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("debates.update.invalid", scope: "decidim.debates")
-            render :edit, status: :unprocessable_entity
+            render :edit, status: :unprocessable_content
           end
         end
       end
@@ -76,12 +76,12 @@ module Decidim
         CloseDebate.call(@form) do
           on(:ok) do |debate|
             flash[:notice] = I18n.t("debates.close.success", scope: "decidim.debates")
-            redirect_back fallback_location: Decidim::ResourceLocatorPresenter.new(debate).path
+            redirect_back_or_to(Decidim::ResourceLocatorPresenter.new(debate).path)
           end
 
           on(:invalid) do
             flash[:alert] = I18n.t("debates.close.invalid", scope: "decidim.debates")
-            redirect_back fallback_location: Decidim::ResourceLocatorPresenter.new(debate).path
+            redirect_back_or_to(Decidim::ResourceLocatorPresenter.new(debate).path)
           end
         end
       end
@@ -125,6 +125,16 @@ module Decidim
       def tab_panel_items
         @tab_panel_items ||= attachments_tab_panel_items(debate)
       end
+
+      def add_breadcrumb_item
+        return {} if debate.blank?
+
+        {
+          label: translated_attribute(debate.title),
+          url: Decidim::EngineRouter.main_proxy(current_component).debate_path(debate),
+          active: false
+        }
+      end
     end
   end
 end

data/app/controllers/decidim/debates/orderable.rb

@@ -14,18 +14,32 @@ module Decidim
         private
 
         def available_orders
-          @available_orders ||= %w(random recent commented updated)
+          @available_orders ||= possible_orders
+        end
+
+        def possible_orders
+          @possible_orders ||= begin
+            possible_orders = %w(random recent updated)
+            possible_orders << "most_commented" if most_commented_order_available?
+            possible_orders
+          end
         end
 
         def default_order
           "updated"
         end
 
+        def most_commented_order_available?
+          return @most_commented_order_available if defined?(@most_commented_order_available)
+
+          @most_commented_order_available = Decidim::Debates::Debate.most_commented_available?(current_component)
+        end
+
         def reorder(debates)
           case order
           when "recent"
             debates.order(created_at: :desc)
-          when "commented"
+          when "most_commented"
             debates.order(comments_count: :desc)
           when "updated"
             debates.order(updated_at: :desc)

data/app/controllers/decidim/debates/versions_controller.rb

@@ -9,7 +9,17 @@ module Decidim
       include Decidim::ResourceVersionsConcern
 
       def versioned_resource
-        @versioned_resource ||= present(Debate.where(component: current_component).not_hidden.find(params[:debate_id]))
+        @versioned_resource ||= Debate.where(component: current_component).not_hidden.find(params[:debate_id])
+      end
+
+      def add_breadcrumb_item
+        return {} if versioned_resource.blank?
+
+        {
+          label: translated_attribute(versioned_resource.title),
+          url: Decidim::EngineRouter.main_proxy(current_component).debate_path(versioned_resource),
+          active: false
+        }
       end
     end
   end

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

@@ -72,19 +72,31 @@ module Decidim
         @filter_sections ||= begin
           items = [{
             method: :with_any_state,
+            name: "[with_any_state]",
             collection: filter_debates_state_values,
             label: t("decidim.debates.debates.filters.state"),
             id: "date",
             type: :radio_buttons
           }]
           current_component.available_taxonomy_filters.each do |taxonomy_filter|
-            items.append(method: "with_any_taxonomies[#{taxonomy_filter.root_taxonomy_id}]",
+            items.append(method: :with_any_taxonomies,
+                         name: "[with_any_taxonomies][#{taxonomy_filter.root_taxonomy_id}]",
                          collection: filter_taxonomy_values_for(taxonomy_filter),
                          label: decidim_sanitize_translated(taxonomy_filter.name),
                          id: "taxonomy-#{taxonomy_filter.root_taxonomy_id}")
           end
-          items.append(method: :with_any_origin, collection: filter_origin_values, label: t("decidim.debates.debates.filters.origin"), id: "origin")
-          items.append(method: :activity, collection: activity_filter_values, label: t("decidim.debates.debates.filters.activity"), id: "activity") if current_user
+          items.append(method: :with_any_origin,
+                       name: "[with_any_origin]",
+                       collection: filter_origin_values,
+                       label: t("decidim.debates.debates.filters.origin"),
+                       id: "origin")
+          if current_user
+            items.append(method: :activity,
+                         name: "[activity]",
+                         collection: activity_filter_values,
+                         label: t("decidim.debates.debates.filters.activity"),
+                         id: "activity")
+          end
 
           items.reject { |item| item[:collection].blank? }
         end

data/app/models/decidim/debates/debate.rb

@@ -220,7 +220,7 @@ module Decidim
       # rubocop:disable Rails/SkipsModelValidations
       def update_comments_count
         comments_count = comments.not_hidden.not_deleted.count
-        last_comment = comments.not_hidden.not_deleted.order("created_at DESC").first
+        last_comment = comments.not_hidden.not_deleted.order(created_at: :desc).first
 
         update_columns(
           last_comment_at: last_comment&.created_at,
@@ -236,6 +236,15 @@ module Decidim
       # Create the :search_text ransacker alias for searching from both of these.
       ransacker_i18n_multi :search_text, [:title, :description]
 
+      def self.most_commented_available?(component)
+        return false unless component.settings.comments_enabled?
+
+        where(component:)
+          .not_hidden
+          .where("comments_count > 0")
+          .exists?
+      end
+
       def self.ransackable_scopes(_auth_object = nil)
         [:with_any_state, :with_any_origin, :with_any_taxonomies]
       end

data/app/permissions/decidim/debates/permissions.rb

@@ -31,6 +31,8 @@ module Decidim
       private
 
       def can_create_debate?
+        return false unless user
+
         authorized?(:create) &&
           current_settings&.creation_enabled? && component.participatory_space.can_participate?(user)
       end

data/app/views/decidim/debates/admin/debates/_debate-tr.html.erb

@@ -8,12 +8,12 @@
   </td>
   <td data-label="<%= t("models.debate.fields.start_time", scope: "decidim.debates") %>">
     <% if debate.start_time %>
-      <%= l debate.start_time, format: :long %>
+      <%= l debate.start_time, format: :decidim_short %>
     <% end %>
   </td>
   <td data-label="<%= t("models.debate.fields.end_time", scope: "decidim.debates") %>">
     <% if debate.end_time %>
-      <%= l debate.end_time, format: :long %>
+      <%= l debate.end_time, format: :decidim_short %>
     <% end %>
   </td>
   <td data-label="<%= t("models.debate.fields.taxonomies", scope: "decidim.debates") %>">

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

@@ -1,7 +1,7 @@
 <% add_decidim_meta_tags(
   description: translated_attribute(current_participatory_space.try(:short_description) || current_participatory_space.description),
   title: t("decidim.components.pagination.page_title",
-           component_name: component_name,
+           component_name:,
            current_page: paginated_debates.current_page,
            total_pages: paginated_debates.total_pages ),
   url: debates_url,

data/config/locales/ar.yml

@@ -1,4 +1,3 @@
----
 ar:
   activemodel:
     attributes:
@@ -124,7 +123,7 @@ ar:
       badges:
         commented_debates:
           conditions:
-          - اختر نقاشًا مفتوحًا للمشاركة فيه
+            - اختر نقاشًا مفتوحًا للمشاركة فيه
           description: تُمنح هذه الشارة عندما تشارك بنشاط في المناقشات المختلفة من خلال ترك تعليقاتك.
           description_another: شارك هذا المشارك في %{score} مناقشات.
           description_own: لقد شاركت في %{score} مناقشات.

data/config/locales/bg.yml

@@ -1,4 +1,3 @@
----
 bg:
   activemodel:
     attributes:
@@ -180,7 +179,7 @@ bg:
       badges:
         commented_debates:
           conditions:
-          - Изберете отворен дебат и участвайте в него
+            - Изберете отворен дебат и участвайте в него
           description: Тази значка се предоставя, когато участвате активно в различни дебати, като оставяте коментари.
           description_another: Този участник се е включил в %{score} дебата.
           description_own: Участвали сте в %{score} дебата.

data/config/locales/ca-IT.yml

@@ -1,4 +1,3 @@
----
 ca-IT:
   activemodel:
     attributes:
@@ -34,6 +33,7 @@ ca-IT:
           comment: Comentar
           create: Crear un debat
           like: M'agrada
+          vote_comment: Votar el comentari
         name: Debats
         settings:
           global:
@@ -156,8 +156,8 @@ ca-IT:
           create: Crear
           title: Crear un debat
         orders:
-          commented: Més comentats
           label: Ordenar debats per
+          most_commented: Més comentats
           random: Ordre aleatori
           recent: Més recents
           updated: Recentment actualitzats
@@ -233,7 +233,7 @@ ca-IT:
       badges:
         commented_debates:
           conditions:
-          - Tria un debat obert per participar
+            - Tria un debat obert per participar
           description: Aquesta ensenya es desbloqueja quan participes activament en els diferents debats deixant els teus comentaris.
           description_another: Aquesta participant ha pres part en %{score} debats.
           description_own: Has participat en %{score} debats.

data/config/locales/ca.yml

@@ -1,4 +1,3 @@
----
 ca:
   activemodel:
     attributes:
@@ -34,6 +33,7 @@ ca:
           comment: Comentar
           create: Crear un debat
           like: M'agrada
+          vote_comment: Votar el comentari
         name: Debats
         settings:
           global:
@@ -156,8 +156,8 @@ ca:
           create: Crear
           title: Crear un debat
         orders:
-          commented: Més comentats
           label: Ordenar debats per
+          most_commented: Més comentats
           random: Ordre aleatori
           recent: Més recents
           updated: Recentment actualitzats
@@ -233,7 +233,7 @@ ca:
       badges:
         commented_debates:
           conditions:
-          - Tria un debat obert per participar
+            - Tria un debat obert per participar
           description: Aquesta ensenya es desbloqueja quan participes activament en els diferents debats deixant els teus comentaris.
           description_another: Aquesta participant ha pres part en %{score} debats.
           description_own: Has participat en %{score} debats.

data/config/locales/cs.yml

@@ -1,4 +1,3 @@
----
 cs:
   activemodel:
     attributes:
@@ -160,8 +159,8 @@ cs:
           create: Vytvořit
           title: Vytvořit novou debatu
         orders:
-          commented: Nejvíce komentované
           label: Řazení debat podle
+          most_commented: Nejvíce komentované
           random: Náhodné pořadí
           recent: Nejnovější
           updated: Naposledy aktualizované
@@ -237,7 +236,7 @@ cs:
       badges:
         commented_debates:
           conditions:
-          - Vyberte si otevřenou debatu, do které se můžete zapojit
+            - Vyberte si otevřenou debatu, do které se můžete zapojit
           description: Tento odznak se uděluje, když se aktivně účastníte různých debat tím, že tam zanecháte své komentáře.
           description_another: Tento uživatel se zúčastnil %{score} debat.
           description_own: Zúčastnili jste se %{score} debat.

data/config/locales/de.yml

@@ -1,4 +1,3 @@
----
 de:
   activemodel:
     attributes:
@@ -232,7 +231,7 @@ de:
       badges:
         commented_debates:
           conditions:
-          - Wählen Sie eine offene Debatte, an der Sie teilnehmen können
+            - Wählen Sie eine offene Debatte, an der Sie teilnehmen können
           description: Dieses Abzeichen wird gewährt, wenn Sie aktiv an den verschiedenen Debatten teilnehmen, indem Sie Ihre Kommentare hinterlassen.
           description_another: Dieser Benutzer hat an %{score} Debatten teilgenommen.
           description_own: Sie haben an %{score} Debatten teilgenommen.

data/config/locales/el.yml

@@ -1,4 +1,3 @@
----
 el:
   activemodel:
     attributes:
@@ -166,7 +165,7 @@ el:
       badges:
         commented_debates:
           conditions:
-          - Επιλέξτε μια ανοιχτή συζήτηση για να λάβετε μέρος
+            - Επιλέξτε μια ανοιχτή συζήτηση για να λάβετε μέρος
           description: Αυτό το έμβλημα χορηγείται όταν συμμετέχετε ενεργά στις διάφορες συζητήσεις αφήνοντας τα σχόλιά σας.
           description_another: Αυτός ο συμμετέχων έλαβε μέρος σε %{score} συζητήσεις.
           description_own: Έχετε συμμετάσχει σε %{score} συζητήσεις.

data/config/locales/en.yml

@@ -34,6 +34,7 @@ en:
           comment: Comment
           create: Create a debate
           like: Like
+          vote_comment: Vote comment
         name: Debates
         settings:
           global:
@@ -156,8 +157,8 @@ en:
           create: Create
           title: Create new debate
         orders:
-          commented: Most commented
           label: Order debates by
+          most_commented: Most commented
           random: Random order
           recent: Most recent
           updated: Recently updated

data/config/locales/es-MX.yml

@@ -1,4 +1,3 @@
----
 es-MX:
   activemodel:
     attributes:
@@ -34,6 +33,7 @@ es-MX:
           comment: Comentar
           create: Crear un debate
           like: Me gusta
+          vote_comment: Votar el comentario
         name: Debates
         settings:
           global:
@@ -156,8 +156,8 @@ es-MX:
           create: Crear
           title: Crear un debate
         orders:
-          commented: Más comentados
           label: Ordenar debates por
+          most_commented: Más comentados
           random: Orden aleatorio
           recent: Más recientes
           updated: Actualizados recientemente
@@ -233,7 +233,7 @@ es-MX:
       badges:
         commented_debates:
           conditions:
-          - Elige un debate abierto para participar
+            - Elige un debate abierto para participar
           description: Este distintivo se otorga cuando participes activamente en los diferentes debates dejando tus comentarios.
           description_another: Este usuario ha participado en %{score} debates.
           description_own: Has participado en %{score} debates.

data/config/locales/es-PY.yml

@@ -1,4 +1,3 @@
----
 es-PY:
   activemodel:
     attributes:
@@ -34,6 +33,7 @@ es-PY:
           comment: Comentar
           create: Crear un debate
           like: Me gusta
+          vote_comment: Votar el comentario
         name: Debates
         settings:
           global:
@@ -152,8 +152,8 @@ es-PY:
           create: Crear
           title: Crear un debate
         orders:
-          commented: Más comentados
           label: Ordenar debates por
+          most_commented: Más comentados
           random: Orden aleatorio
           recent: Más recientes
           updated: Actualizados recientemente
@@ -229,7 +229,7 @@ es-PY:
       badges:
         commented_debates:
           conditions:
-          - Elige un debate abierto para participar.
+            - Elige un debate abierto para participar.
           description: Este distintivo se otorga cuando usted participa activamente en los diferentes debates dejando sus comentarios.
           description_another: Este usuario ha participado en %{score} debates.
           description_own: Usted ha participado en %{score} debates.

data/config/locales/es.yml

@@ -1,4 +1,3 @@
----
 es:
   activemodel:
     attributes:
@@ -34,6 +33,7 @@ es:
           comment: Comentar
           create: Crear un debate
           like: Me gusta
+          vote_comment: Votar el comentario
         name: Debates
         settings:
           global:
@@ -156,8 +156,8 @@ es:
           create: Crear
           title: Crear un debate
         orders:
-          commented: Más comentados
           label: Ordenar debates por
+          most_commented: Más comentados
           random: Orden aleatorio
           recent: Más recientes
           updated: Actualizados recientemente
@@ -233,7 +233,7 @@ es:
       badges:
         commented_debates:
           conditions:
-          - Elige un debate abierto para participar
+            - Elige un debate abierto para participar
           description: Este distintivo se otorga cuando participes activamente en los diferentes debates dejando tus comentarios.
           description_another: Esta participante ha tomado parte en %{score} debates.
           description_own: Has participado en %{score} debates.

data/config/locales/eu.yml

@@ -1,4 +1,3 @@
----
 eu:
   activemodel:
     attributes:
@@ -34,6 +33,7 @@ eu:
           comment: Iruzkina
           create: Sortu eztabaida bat
           like: Atsegin dut
+          vote_comment: Bozkatu iruzkina
         name: Eztabaidak
         settings:
           global:
@@ -156,8 +156,8 @@ eu:
           create: Sortu
           title: Sortu eztabaida berri bat
         orders:
-          commented: Iruzkin gehien dutenak
           label: Ordenatu eztabaidak honen arabera
+          most_commented: Iruzkin gehien dutenak
           random: Ausazko ordena
           recent: Berrienetatik zaharrenetara
           updated: Orain dela gutxi eguneratuak
@@ -233,7 +233,7 @@ eu:
       badges:
         commented_debates:
           conditions:
-          - Aukeratu eztabaida irekia parte hartzeko
+            - Aukeratu eztabaida irekia parte hartzeko
           description: Garaikur hau eztabaidetan modu aktiboan, zure iruzkinak utziz, parte hartzen duzunean ematen da.
           description_another: Parte-hartzaile honek %{score} eztabaidatan hartu du parte.
           description_own: '%{score} eztabaidatan hartu duzu parte.'

data/config/locales/fi-plain.yml

@@ -1,4 +1,3 @@
----
 fi-pl:
   activemodel:
     attributes:
@@ -34,6 +33,7 @@ fi-pl:
           comment: Kommentoi
           create: Luo keskustelu
           like: Tykkää
+          vote_comment: Äänestä kommenttia
         name: Keskustelut
         settings:
           global:
@@ -156,8 +156,8 @@ fi-pl:
           create: Luo
           title: Luo uusi keskustelu
         orders:
-          commented: Eniten kommentoidut
           label: Järjestä keskustelut
+          most_commented: Eniten kommentoidut
           random: Satunnainen järjestys
           recent: Viimeisimmät
           updated: Viimeksi päivitetyt
@@ -233,7 +233,7 @@ fi-pl:
       badges:
         commented_debates:
           conditions:
-          - Valitse avoin keskustelu ja osallistu siihen
+            - Valitse avoin keskustelu ja osallistu siihen
           description: Tämä kunniamerkki myönnetään, kun osallistut aktiivisesti eri keskusteluihin.
           description_another: Tämä käyttäjä on osallistunut %{score} keskusteluun.
           description_own: Olet osallistunut %{score} keskusteluun.

data/config/locales/fi.yml

@@ -1,4 +1,3 @@
----
 fi:
   activemodel:
     attributes:
@@ -34,6 +33,7 @@ fi:
           comment: Kommentoi
           create: Luo keskustelu
           like: Tykkää
+          vote_comment: Äänestä kommenttia
         name: Keskustelut
         settings:
           global:
@@ -156,8 +156,8 @@ fi:
           create: Luo
           title: Luo uusi keskustelu
         orders:
-          commented: Eniten kommentoidut
           label: Järjestä keskustelut
+          most_commented: Eniten kommentoidut
           random: Satunnainen järjestys
           recent: Viimeisimmät
           updated: Viimeksi päivitetyt
@@ -233,7 +233,7 @@ fi:
       badges:
         commented_debates:
           conditions:
-          - Valitse avoin keskustelu ja osallistu siihen
+            - Valitse avoin keskustelu ja osallistu siihen
           description: Tämä kunniamerkki myönnetään, kun osallistut aktiivisesti eri keskusteluihin.
           description_another: Tämä käyttäjä on osallistunut %{score} keskusteluun.
           description_own: Olet osallistunut %{score} keskusteluun.