decidim-debates 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c5154f69ad0a0b6a244b3bb0a6b0a7b83fb665ca2ef34cb8702507ba55ee58c
-  data.tar.gz: 9cab95324efb5840cadf2c3d984c7384665c2b88a12d31dd383cda7bbbb48fa8
+  metadata.gz: 72a1803a58c725073343620f86a646c1d2ef91f7e20b40fa5c9c6daeee8c3cb5
+  data.tar.gz: 29591d95a7f004f169d0a9cbc08c263f5f2d19299f203ac844d4fd941d3476b7
 SHA512:
-  metadata.gz: a150b2f6a3246d9d0e5f4402e1bde76a0e80a9bf00b1e7525b3b5bdf3745fd54697a5ff38bb67538a6636425480022b4b818c097979a1132db1062bd17f61a3b
-  data.tar.gz: eae4e679cbc8ce32b06ff317e4e7a14fac1b11b48732d2e78f39e6b8b1ad46e695e7c6fe9d4e6430ffb3ea3e287537c0c9de6b3c0fc182862c46b4201d0a79a3
+  metadata.gz: c606a1b8e63ea4458e0ba0d203f3e918448c101b70abf86e6a1434a5c7bfd1d779bea19dd3ab05cf361ddbd6af69f17848df3cd1c14b424d61bed35c4e7aec8e
+  data.tar.gz: 7053f5592a9f005c5096bb6b6410d0afc0bc3caad20fe381d732e78b9dda879f102582f8f389df1a05342081159e7d97753a0ca9608b0efc225aff78d35fbe70

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

@@ -28,6 +28,7 @@ module Decidim
       def debate_date
         return unless start_date && end_date
         return render(:multiple_dates) if spans_multiple_dates?
+
         render(:single_date)
       end
 
@@ -41,11 +42,13 @@ module Decidim
 
       def start_date
         return unless model.start_time
+
         model.start_time.to_date
       end
 
       def end_date
         return unless model.end_time
+
         model.end_time.to_date
       end
     end

data/app/forms/decidim/debates/admin/debate_form.rb

@@ -29,6 +29,7 @@ module Decidim
 
         def category
           return unless current_component
+
           @category ||= current_component.categories.find_by(id: decidim_category_id)
         end
       end

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

@@ -72,6 +72,7 @@ module Decidim
       # Public: Overrides the `accepts_new_comments?` Commentable concern method.
       def accepts_new_comments?
         return false unless open?
+
         commentable? && !comments_blocked?
       end
 
@@ -90,14 +91,10 @@ module Decidim
         self.class.name
       end
 
-      # Public: Overrides the `notifiable?` Notifiable concern method.
-      def notifiable?(_context)
-        false
-      end
-
       # Public: Override Commentable concern method `users_to_notify_on_comment_created`
       def users_to_notify_on_comment_created
         return Decidim::User.where(id: followers).or(Decidim::User.where(id: component.participatory_space.admins)).distinct if official?
+
         followers
       end
 

data/app/queries/decidim/debates/metrics/debates_metric_manage.rb

@@ -14,6 +14,7 @@ module Decidim
           @registry = []
           cumulative.each do |key, cumulative_value|
             next if cumulative_value.zero?
+
             quantity_value = quantity[key] || 0
             category_id, space_type, space_id = key
             record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,

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

@@ -22,7 +22,7 @@
           <% debates.each do |debate| %>
             <tr data-id="<%= debate.id %>">
               <td>
-                <%= link_to translated_attribute(debate.title), resource_locator(debate).path, target: :blank %><br />
+                <%= link_to translated_attribute(debate.title), resource_locator(debate).path, target: :blank %><br>
               </td>
               <td>
                 <% if debate.start_time %>

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

@@ -38,7 +38,7 @@ edit_link(
       </div>
     </div>
     <%= resource_reference(debate) %>
-    <%= render partial: "share", locals: { debate: debate } %>
+    <%= render partial: "decidim/shared/share_modal" %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
@@ -64,9 +64,6 @@ edit_link(
 
 <%= comments_for debate %>
 
-<%= javascript_include_tag "decidim/proposals/social_share" %>
-<%= stylesheet_link_tag "decidim/proposals/social_share" %>
-
 <%=
   render partial: "decidim/shared/flag_modal", locals: {
     reportable: debate,

data/config/locales/ar.yml

@@ -104,10 +104,6 @@ ar:
           create: إنشاء
           select_a_category: الرجاء تحديد الفئة
           title: نقاش جديد
-        share:
-          close_window: أغلق النافذة
-          share: شارك
-          share_link: مشاركة الرابط
       last_activity:
         new_debate_at_html: "<span>مناقشة جديدة في %{link}</span>"
       models:

data/config/locales/ca.yml

@@ -96,10 +96,6 @@ ca:
           create: Crear
           select_a_category: Si us plau, selecciona una categoria
           title: Nou debat
-        share:
-          close_window: Tanca la finestra
-          share: Compartir
-          share_link: Comparteix l'enllaç
       last_activity:
         new_debate_at_html: "<span>Nou debat a %{link}</span>"
       models:

data/config/locales/cs.yml

@@ -100,10 +100,6 @@ cs:
           create: Vytvořit
           select_a_category: Vyberte kategorii
           title: Nová debata
-        share:
-          close_window: Zavřete okno
-          share: Podíl
-          share_link: Sdílet odkaz
       last_activity:
         new_debate_at_html: "<span>Nová diskuse na %{link}</span>"
       models:

data/config/locales/de.yml

@@ -96,10 +96,6 @@ de:
           create: Erstellen
           select_a_category: Bitte wählen sie eine Kategorie
           title: Neue Debatte
-        share:
-          close_window: Fenster schließen
-          share: Teilen
-          share_link: Link teilen
       last_activity:
         new_debate_at_html: "<span>Neue Debatte bei %{link}</span>"
       models:

data/config/locales/en.yml

@@ -97,10 +97,6 @@ en:
           create: Create
           select_a_category: Please select a category
           title: New debate
-        share:
-          close_window: Close window
-          share: Share
-          share_link: Share link
       last_activity:
         new_debate_at_html: "<span>New debate at %{link}</span>"
       models:

data/config/locales/es-MX.yml

@@ -96,10 +96,6 @@ es-MX:
           create: Crear
           select_a_category: Por favor, selecciona una categoría
           title: Nuevo debate
-        share:
-          close_window: Cerrar ventana
-          share: Compartir
-          share_link: Compartir enlace
       last_activity:
         new_debate_at_html: "<span>Nuevo debate en %{link}</span>"
       models:

data/config/locales/es-PY.yml

@@ -96,10 +96,6 @@ es-PY:
           create: Crear
           select_a_category: Por favor, selecciona una categoría
           title: Nuevo debate
-        share:
-          close_window: Cerrar ventana
-          share: Compartir
-          share_link: Compartir enlace
       last_activity:
         new_debate_at_html: "<span>Nuevo debate en %{link}</span>"
       models:

data/config/locales/es.yml

@@ -96,10 +96,6 @@ es:
           create: Crear
           select_a_category: Por favor, selecciona una categoría
           title: Nuevo debate
-        share:
-          close_window: Cerrar la ventana
-          share: Compartir
-          share_link: Compartir enlace
       last_activity:
         new_debate_at_html: "<span>Nuevo debate en %{link}</span>"
       models:

data/config/locales/eu.yml

@@ -96,10 +96,6 @@ eu:
           create: Sortu
           select_a_category: Hautatu kategoria bat
           title: Berri eztabaida
-        share:
-          close_window: Itxi leihoa
-          share: Share
-          share_link: Partekatu esteka
       last_activity:
         new_debate_at_html: "<span> %{link}</span>eztabaida berria"
       models:

data/config/locales/fi-plain.yml

@@ -96,10 +96,6 @@ fi-pl:
           create: Luo
           select_a_category: Valitse aihepiiri
           title: Uusi keskustelu
-        share:
-          close_window: Sulje ikkuna
-          share: Jaa
-          share_link: Jaa linkki
       last_activity:
         new_debate_at_html: "<span>Uusi keskustelu osoitteessa %{link}</span>"
       models:

data/config/locales/fi.yml

@@ -96,10 +96,6 @@ fi:
           create: Luo
           select_a_category: Valitse aihepiiri
           title: Uusi keskustelu
-        share:
-          close_window: Sulje ikkuna
-          share: Jaa
-          share_link: Jaa linkki
       last_activity:
         new_debate_at_html: "<span>Uusi keskustelu osoitteessa %{link}</span>"
       models:

data/config/locales/fr.yml

@@ -96,10 +96,6 @@ fr:
           create: Créer
           select_a_category: Veuillez sélectionner une catégorie
           title: Nouveau débat
-        share:
-          close_window: Fermer la fenêtre
-          share: Partager
-          share_link: Lien de partage
       last_activity:
         new_debate_at_html: "<span>Nouveau débat à %{link}</span>"
       models:

data/config/locales/gl.yml

@@ -96,10 +96,6 @@ gl:
           create: Crear
           select_a_category: Selecciona unha categoría
           title: Novo debate
-        share:
-          close_window: Pechar ventá
-          share: Comparte
-          share_link: Compartir a ligazón
       last_activity:
         new_debate_at_html: "<span>Novo debate en %{link}</span>"
       models:

data/config/locales/hu.yml

@@ -96,10 +96,6 @@ hu:
           create: Létrehozás
           select_a_category: Válassz kategóriát
           title: Új vita
-        share:
-          close_window: Ablak bezárása
-          share: Megosztás
-          share_link: Link megosztása
       last_activity:
         new_debate_at_html: "<span>Új vita %{link}</span>"
       models:

data/config/locales/id-ID.yml

@@ -94,10 +94,6 @@ id:
           create: Membuat
           select_a_category: Silakan pilih kategori
           title: Debat baru
-        share:
-          close_window: Tutup jendela
-          share: Bagikan
-          share_link: Membagikan tautan
       last_activity:
         new_debate_at_html: "<span>Debat baru di %{link}</span>"
       models:

data/config/locales/it.yml

@@ -96,10 +96,6 @@ it:
           create: Creare
           select_a_category: Si prega di selezionare una categoria
           title: Nuovo dibattito
-        share:
-          close_window: Chiudi la finestra
-          share: Condividere
-          share_link: Condividi il link
       last_activity:
         new_debate_at_html: "<span>Nuovo dibattito al %{link}</span>"
       models:

data/config/locales/nl.yml

@@ -96,10 +96,6 @@ nl:
           create: Aanmaken
           select_a_category: Selecteer een categorie
           title: Nieuw debat
-        share:
-          close_window: Sluit venster
-          share: Delen
-          share_link: Link delen
       last_activity:
         new_debate_at_html: "<span>Nieuw debat op %{link}</span>"
       models:

data/config/locales/pl.yml

@@ -100,10 +100,6 @@ pl:
           create: Stwórz
           select_a_category: Proszę wybierz kategorie
           title: Nowa debata
-        share:
-          close_window: Zamknij okno
-          share: Dzielić
-          share_link: Udostępnij link
       last_activity:
         new_debate_at_html: "<span>Nowa debata na %{link}</span>"
       models:

data/config/locales/pt-BR.yml

@@ -96,10 +96,6 @@ pt-BR:
           create: Criar
           select_a_category: Selecione uma categoria
           title: Novo debate
-        share:
-          close_window: Fechar janela
-          share: Compartilhar
-          share_link: Compartilhar link
       last_activity:
         new_debate_at_html: "<span>Novo debate em %{link}</span>"
       models:

data/config/locales/pt.yml

@@ -96,10 +96,6 @@ pt:
           create: Crio
           select_a_category: Por favor, selecione uma categoria
           title: Novo debate
-        share:
-          close_window: Janela fechada
-          share: Compartilhar
-          share_link: Compartilhar link
       last_activity:
         new_debate_at_html: "<span>Novo debate em %{link}</span>"
       models:

data/config/locales/ru.yml

@@ -100,10 +100,6 @@ ru:
           create: Создать
           select_a_category: Пожалуйста, выберите категорию
           title: Начать новое обсуждение
-        share:
-          close_window: Закрыть окно
-          share: Поделиться
-          share_link: Поделиться ссылкой
       models:
         debate:
           fields:

data/config/locales/sv.yml

@@ -96,10 +96,6 @@ sv:
           create: Skapa
           select_a_category: Välj en kategori
           title: Ny debatt
-        share:
-          close_window: Stäng fönster
-          share: Dela
-          share_link: Dela länk
       last_activity:
         new_debate_at_html: "<span>Ny debatt i %{link}</span>"
       models:

data/config/locales/tr-TR.yml

@@ -96,10 +96,6 @@ tr:
           create: yaratmak
           select_a_category: Lütfen bir kategori seçin
           title: Yeni tartışma
-        share:
-          close_window: Pencereyi kapat
-          share: Pay
-          share_link: Linki paylaş
       last_activity:
         new_debate_at_html: "<span> %{link}</span>yeni tartışma"
       models:

data/config/locales/uk.yml

@@ -100,10 +100,6 @@ uk:
           create: Започаткувати
           select_a_category: Будь ласка, виберіть категорію
           title: Додати обговорення
-        share:
-          close_window: Закрити вікно
-          share: Поділитися
-          share_link: Поділитись посиланням
       models:
         debate:
           fields:

data/lib/decidim/debates/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-debates version.
   module Debates
     def self.version
-      "0.18.1"
+      "0.19.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-debates
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -19,42 +19,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: searchlight
   requirement: !ruby/object:Gem::Requirement
@@ -75,28 +75,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 description: A debates component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -156,7 +156,6 @@ files:
 - app/views/decidim/debates/debates/_debates.html.erb
 - app/views/decidim/debates/debates/_filters.html.erb
 - app/views/decidim/debates/debates/_filters_small_view.html.erb
-- app/views/decidim/debates/debates/_share.html.erb
 - app/views/decidim/debates/debates/index.html.erb
 - app/views/decidim/debates/debates/index.js.erb
 - app/views/decidim/debates/debates/new.html.erb

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

@@ -1,33 +0,0 @@
-<div class="text-center">
-  <button class="link text-center" data-open="processShare">
-    <%= t(".share") %>
-    <%= icon "share", class: "icon--after" %>
-  </button>
-</div>
-<div class="reveal" id="processShare" data-reveal>
-  <div class="reveal__header">
-    <h3 class="reveal__title"><%= t(".share") %>:</h3>
-    <button class="close-button" data-close aria-label="<%= t(".close_window") %>" type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <div class="button-group text-center">
-  <%= social_share_button_tag(content_for(:meta_title),
-        url: content_for(:meta_url),
-        image: content_for(:meta_image_url),
-        desc: content_for(:meta_description),
-        via: content_for(:twitter_handler)) %>
-    <a class="button secondary" data-open="urlShare">
-      <%= icon "link-intact" %>
-    </a>
-  </div>
-</div>
-<div class="reveal" id="urlShare" data-reveal>
-  <div class="reveal__header">
-    <h3 class="reveal__title"><%= t(".share_link") %>:</h3>
-    <button class="close-button" data-close aria-label="<%= t(".close_window") %>" type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <input type="text" value="<%= "#{content_for(:meta_url)}" %>" readonly />
-</div>