decidim-debates 0.11.2 → 0.12.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90ea5c9a6374ff7afaea5c66e2c5d35b302cabe84d1b981aeb94b2114ec7d8ec
-  data.tar.gz: 77577372b38ac48b22ff1087a91d0580e1640bba2e14bc0ddcc420b353deed75
+  metadata.gz: 17b015a50338b364f276f4b8bc4a43e2d10acc39f4584ca70950876729d11a3a
+  data.tar.gz: 64d37f3b5772ddb123d2c1ccd6e92255ab14d86bae5a586e3852a71403acd058
 SHA512:
-  metadata.gz: 2352dc5bacfb501f178c2b3b09cd32a5e2f72369f36350a14b32699d0249ddaa4ddf859e6ecf11e0f20c4647302bcf783995793ad2e13b12cee8ae435191bad7
-  data.tar.gz: 2abd2557969f14d07d678eefc50d960757775930a85bfa6977709ac0daa9f42b023be183e567aef2ab4691ffb7f688cc4b5c4ac8ab892c4c1c7a925215984743
+  metadata.gz: 1d7164cf538628de8a26642638dd8066b1a73fa351235ce09215e66c3e6ee1cccd90ad269fc6c2f0fb29ae3af7b6f451d3511780ff480dff10a5cbc8f944abb1
+  data.tar.gz: b68f8c35afab244a77df435b996d707cb2b335e9c208242d151a8eddf9aea7fde63aabbfb26ba4f64a50ec3ecb1ae3ef36b041bcf2e39baf54665781a4a091ea

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    # This cell renders the debate card for an instance of a Debate
+    # the default size is the Medium Card (:m)
+    class DebateCell < Decidim::ViewModel
+      include DebateCellsHelper
+      include Cell::ViewModel::Partial
+
+      def show
+        cell card_size, model
+      end
+
+      private
+
+      def card_size
+        "decidim/debates/debate_m"
+      end
+    end
+  end
+end

data/app/cells/decidim/debates/debate_m/footer.erb

@@ -0,0 +1,5 @@
+<div class="card__footer">
+  <div class="card__support">
+    <%= link_to t("participate", scope: "decidim.debates.debates.debate"), resource_path, class: "card__button button secondary button--sc small light" %>
+  </div>
+</div>

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    # This cell renders the Medium (:m) debate card
+    # for an given instance of a Debate
+    class DebateMCell < Decidim::CardMCell
+      include DebateCellsHelper
+
+      private
+
+      def resource_icon
+        icon "debates", class: "icon--big"
+      end
+
+      def spans_multiple_dates?
+        start_date != end_date
+      end
+
+      def debate_date
+        return render(:multiple_dates) if spans_multiple_dates?
+        render(:single_date)
+      end
+
+      def formatted_start_time
+        model.start_time.strftime("%H:%M")
+      end
+
+      def formatted_end_time
+        model.end_time.strftime("%H:%M")
+      end
+
+      def start_date
+        model.start_time.to_date
+      end
+
+      def end_date
+        model.end_time.to_date
+      end
+    end
+  end
+end

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

@@ -4,14 +4,22 @@ module Decidim
   module Debates
     module Admin
       # This controller allows an admin to manage debates from a Participatory Space
-      class DebatesController < Admin::ApplicationController
+      class DebatesController < Decidim::Debates::Admin::ApplicationController
         helper_method :debates
 
+        def index
+          enforce_permission_to :read, :debate
+        end
+
         def new
+          enforce_permission_to :create, :debate
+
           @form = form(Decidim::Debates::Admin::DebateForm).instance
         end
 
         def create
+          enforce_permission_to :create, :debate
+
           @form = form(Decidim::Debates::Admin::DebateForm).from_params(params, current_component: current_component)
 
           CreateDebate.call(@form) do
@@ -28,12 +36,14 @@ module Decidim
         end
 
         def edit
-          authorize! :edit, debate
+          enforce_permission_to :update, :debate, debate: debate
+
           @form = form(DebateForm).from_model(debate)
         end
 
         def update
-          authorize! :edit, debate
+          enforce_permission_to :update, :debate, debate: debate
+
           @form = form(DebateForm).from_params(params, current_component: current_component)
 
           UpdateDebate.call(@form, debate) do
@@ -50,7 +60,8 @@ module Decidim
         end
 
         def destroy
-          authorize! :destroy, debate
+          enforce_permission_to :delete, :debate, debate: debate
+
           debate.destroy!
 
           flash[:notice] = I18n.t("debates.destroy.success", scope: "decidim.debates.admin")

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

@@ -13,13 +13,14 @@ module Decidim
       helper_method :debates, :debate, :paginated_debates, :report_form
 
       def new
-        authorize! :create, Debate
+        enforce_permission_to :create, :debate
 
         @form = form(DebateForm).instance
       end
 
       def create
-        authorize! :create, Debate
+        enforce_permission_to :create, :debate
+
         @form = form(DebateForm).from_params(params, current_component: current_component)
 
         CreateDebate.call(@form) do

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    # Custom helpers for debates cells.
+    #
+    module DebateCellsHelper
+      include PaginateHelper
+      include Decidim::Comments::CommentsHelper
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    module Admin
+      class Permissions < Decidim::DefaultPermissions
+        def permissions
+          # The public part needs to be implemented yet
+          return permission_action if permission_action.scope != :admin
+          return permission_action if permission_action.subject != :debate
+
+          case permission_action.action
+          when :create, :read
+            allow!
+          when :update, :delete
+            toggle_allow(debate && debate.official?)
+          end
+
+          permission_action
+        end
+
+        private
+
+        def debate
+          @debate ||= context.fetch(:debate, nil)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    class Permissions < Decidim::DefaultPermissions
+      def permissions
+        # Delegate the admin permission checks to the admin permissions class
+        return Decidim::Debates::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
+        return permission_action if permission_action.scope != :public
+
+        return permission_action if permission_action.subject != :debate
+
+        case permission_action.action
+        when :create
+          toggle_allow(can_create_debate?)
+        when :report
+          allow!
+        end
+
+        permission_action
+      end
+
+      private
+
+      def can_create_debate?
+        authorized?(:create) &&
+          current_settings&.creation_enabled?
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
     <h2 class="card-title">
       <%= t(".title") %>
 
-      <%= link_to t("actions.new", scope: "decidim.debates", name: t("models.debate.name", scope: "decidim.debates.admin")), new_debate_path, class: "button tiny button--title" if can? :manage, current_component %>
+      <%= link_to t("actions.new", scope: "decidim.debates", name: t("models.debate.name", scope: "decidim.debates.admin")), new_debate_path, class: "button tiny button--title" if allowed_to? :create, :debate %>
     </h2>
   </div>
 
@@ -35,11 +35,11 @@
                 <% end %>
               </td>
               <td class="table-list__actions">
-                <% if can? :update, debate %>
+                <% if allowed_to? :update, :debate, debate: debate %>
                   <%= icon_link_to "pencil", edit_debate_path(debate), t("actions.edit", scope: "decidim.debates"), class: "action-icon--edit" %>
                 <% end %>
 
-                <% if can? :destroy, debate %>
+                <% if allowed_to? :delete, :debate, debate: debate %>
                   <%= icon_link_to "circle-x", debate_path(debate), t("actions.destroy", scope: "decidim.debates"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.debates") } %>
                 <% end %>
               </td>

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

@@ -1,42 +1 @@
-<div class="column">
-  <article class="card card--debate">
-    <div class="card__content">
-      <div class="card__header">
-        <%= link_to debate_path(debate), class: "card__link" do %>
-          <h5 class="card__title"><%= translated_attribute debate.title %></h5>
-        <% end %>
-      </div>
-      <% if debate.start_time.present? && debate.end_time.present? %>
-        <div class="card__datetime">
-          <div class="card__datetime__date">
-            <%= l debate.start_time, format: "%d" %> <span class="card__datetime__month"><%= l debate.start_time, format: "%B" %></span>
-          </div>
-          <div class="card__datetime__time">
-            <%= l debate.start_time, format: "%H:%M" %> - <%= l debate.end_time, format: "%H:%M" %>
-          </div>
-        </div>
-      <% end %>
-      <p class="card__desc">
-        <%== html_truncate(translated_attribute(debate.description), length: 630, separator: "...") %>
-      </p>
-      <% if debate.category.present? %>
-        <ul class="tags tags--debate">
-          <li><%= link_to translated_attribute(debate.category.name), debates_path(filter: { category_id: debate.category.id }) %></li>
-        </ul>
-      <% end %>
-    </div>
-    <div class="card__footer">
-      <div class="card__support">
-        <div id="debate-<%= debate.id %>-votes-count" class="card__support__data">
-          <span class="card__support__number">
-            <%= debate.comments.count %>
-          </span>
-          <span>
-            <%= t(".comments", count: debate.comments.count) %>
-          </span>
-        </div>
-        <%= link_to t(".participate"), debate_path(debate), class: "button small secondary card__button" %>
-      </div>
-    </div>
-  </article>
-</div>
+<%= card_for debate, from: debate, context: { current_user: current_user } %>

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

@@ -8,22 +8,9 @@
   <h2 class="heading2">
     <%== translated_attribute debate.title %>
   </h2>
-  <div class="author-data">
-    <%= render partial: "decidim/shared/author_reference", locals: { author: Decidim::Debates::DebatePresenter.new(debate).author } %>
-    <div class="author-data__extra">
-      <button type="button" data-open="<%= current_user.present? ? "flagModal" : "loginModal" %>" title="<%= t(".report") %>" aria-controls="<%= current_user.present? ? "flagModal" : "loginModal" %>" aria-haspopup="true" tabindex="0">
-        <%= icon "flag", aria_label: t(".report"), class: "icon--small" %>
-      </button>
-      <% unless debate.official? %>
-        <%= link_to_current_or_new_conversation_with(debate.author) %>
-      <% end %>
-    </div>
-    <% if debate.commentable? %>
-      <a href="#comments" title="<%= t(".comments") %>">
-        <%= icon "comment-square", aria_label: t(".comments"), role: "img" %> <%= debate.comments.count %>
-      </a>
-    <% end %>
-  </div>
+
+  <%= cell "decidim/author", Decidim::Debates::DebatePresenter.new(debate).author, context: {extra_classes: ["author-data--small"]} %>
+
 </div>
 <div class="row">
   <div class="columns section view-side mediumlarge-4 mediumlarge-push-8

data/config/locales/ca.yml

@@ -11,6 +11,15 @@ ca:
         start_time: Data d'inici
         title: Títol
         user_group_id: Crea un debat com
+    models:
+      decidim/debates/create_debate_event: Debat
+      decidim/debates/creation_disabled_event: Debats desactivats
+      decidim/debates/creation_enabled_event: Debats habilitats
+  activerecord:
+    models:
+      decidim/debates/debate:
+        one: Debat
+        other: Debats
   decidim:
     components:
       debates:
@@ -66,9 +75,6 @@ ca:
           invalid: Hi ha hagut un problema en crear el debat.
           success: Debat creat correctament.
         debate:
-          comments:
-            one: Comentari
-            other: Comentaris
           participate: Participa
         filters:
           all: Tots
@@ -94,9 +100,6 @@ ca:
           close_window: Tanca la finestra
           share: Compartir
           share_link: Comparteix l'enllaç
-        show:
-          comments: Comentaris
-          report: Denuncia
       models:
         debate:
           fields:

data/config/locales/en.yml

@@ -12,6 +12,15 @@ en:
         start_time: Starts at
         title: Title
         user_group_id: Create debate as
+    models:
+      decidim/debates/create_debate_event: Debate
+      decidim/debates/creation_disabled_event: Debates disabled
+      decidim/debates/creation_enabled_event: Debates enabled
+  activerecord:
+    models:
+      decidim/debates/debate:
+        one: Debate
+        other: Debates
   decidim:
     components:
       debates:
@@ -67,9 +76,6 @@ en:
           invalid: There has been a problem while creating the debate.
           success: Debate created successfully.
         debate:
-          comments:
-            one: Comment
-            other: Comments
           participate: Participate
         filters:
           all: All
@@ -95,9 +101,6 @@ en:
           close_window: Close window
           share: Share
           share_link: Share link
-        show:
-          comments: Comments
-          report: Report
       models:
         debate:
           fields:

data/config/locales/es.yml

@@ -11,6 +11,15 @@ es:
         start_time: Fecha de inicio
         title: Título
         user_group_id: Crear debate como
+    models:
+      decidim/debates/create_debate_event: Debate
+      decidim/debates/creation_disabled_event: Debates deshabilitados
+      decidim/debates/creation_enabled_event: Debates habilitados
+  activerecord:
+    models:
+      decidim/debates/debate:
+        one: Debate
+        other: Debates
   decidim:
     components:
       debates:
@@ -66,9 +75,6 @@ es:
           invalid: Ha habido un problema al crear el debate.
           success: Debate creado con éxito.
         debate:
-          comments:
-            one: Comentario
-            other: Comentarios
           participate: Participar
         filters:
           all: Todos
@@ -94,9 +100,6 @@ es:
           close_window: Cerrar ventana
           share: Compartir
           share_link: Compartir enlace
-        show:
-          comments: Comentarios
-          report: Informe
       models:
         debate:
           fields:

data/config/locales/eu.yml

@@ -11,6 +11,15 @@ eu:
         start_time: Hasi da
         title: Izenburua
         user_group_id: Sortu eztabaida gisa
+    models:
+      decidim/debates/create_debate_event: Debate
+      decidim/debates/creation_disabled_event: Debateak desgaituta daude
+      decidim/debates/creation_enabled_event: Debateak gaituta
+  activerecord:
+    models:
+      decidim/debates/debate:
+        one: Debate
+        other: eztabaidak
   decidim:
     components:
       debates:
@@ -66,9 +75,6 @@ eu:
           invalid: Arazo bat izan da eztabaida sortzen ari den bitartean.
           success: Debate sortu da behar bezala.
         debate:
-          comments:
-            one: Iruzkina
-            other: Oharrak
           participate: Parte hartu
         filters:
           all: guztiak
@@ -94,9 +100,6 @@ eu:
           close_window: Itxi leihoa
           share: Share
           share_link: Partekatu esteka
-        show:
-          comments: Oharrak
-          report: txostena
       models:
         debate:
           fields:

data/config/locales/fi.yml

@@ -11,6 +11,15 @@ fi:
         start_time: Alkamisaika
         title: Otsikko
         user_group_id: Luo keskustelu käyttäjänä
+    models:
+      decidim/debates/create_debate_event: Keskustelu
+      decidim/debates/creation_disabled_event: Keskustelut poistettu käytöstä
+      decidim/debates/creation_enabled_event: Keskustelut käytössä
+  activerecord:
+    models:
+      decidim/debates/debate:
+        one: Keskustelu
+        other: keskustelut
   decidim:
     components:
       debates:
@@ -66,9 +75,6 @@ fi:
           invalid: Luotaessa keskustelua tapahtui virhe.
           success: Keskustelu luotu onnistuneesti.
         debate:
-          comments:
-            one: Kommentti
-            other: Kommenttia
           participate: Osallistu
         filters:
           all: Kaikki
@@ -94,9 +100,6 @@ fi:
           close_window: Sulje ikkuna
           share: Jaa
           share_link: Jaa linkki
-        show:
-          comments: Kommentit
-          report: Raportti
       models:
         debate:
           fields:

data/config/locales/fr.yml

@@ -11,6 +11,15 @@ fr:
         start_time: Commence à
         title: Titre
         user_group_id: Créer un débat en tant que
+    models:
+      decidim/debates/create_debate_event: Débat
+      decidim/debates/creation_disabled_event: Débats désactivés
+      decidim/debates/creation_enabled_event: Débats activés
+  activerecord:
+    models:
+      decidim/debates/debate:
+        one: Débat
+        other: Débats
   decidim:
     components:
       debates:
@@ -66,9 +75,6 @@ fr:
           invalid: Il y a eu un problème lors de la création du débat.
           success: Débat créé avec succès.
         debate:
-          comments:
-            one: Commentaire
-            other: Commentaires
           participate: Participer
         filters:
           all: Tout
@@ -94,9 +100,6 @@ fr:
           close_window: Fermer la fenêtre
           share: Partager
           share_link: Lien de partage
-        show:
-          comments: Commentaires
-          report: Rapport
       models:
         debate:
           fields:

data/config/locales/gl.yml

@@ -11,6 +11,15 @@ gl:
         start_time: Comeza en
         title: Título
         user_group_id: Crear debate como
+    models:
+      decidim/debates/create_debate_event: Debate
+      decidim/debates/creation_disabled_event: Debates desactivados
+      decidim/debates/creation_enabled_event: Debates habilitados
+  activerecord:
+    models:
+      decidim/debates/debate:
+        one: Debate
+        other: Debates
   decidim:
     components:
       debates:
@@ -66,9 +75,6 @@ gl:
           invalid: Produciuse un problema ao crear o debate.
           success: Debate creouse con éxito.
         debate:
-          comments:
-            one: Comentario
-            other: Comentarios
           participate: Participar
         filters:
           all: Todo
@@ -94,9 +100,6 @@ gl:
           close_window: Pechar ventá
           share: Comparte
           share_link: Compartir a ligazón
-        show:
-          comments: Comentarios
-          report: Informe
       models:
         debate:
           fields:

data/config/locales/it.yml

@@ -11,6 +11,15 @@ it:
         start_time: Inizia a
         title: Titolo
         user_group_id: Crea dibattito come
+    models:
+      decidim/debates/create_debate_event: Discussione
+      decidim/debates/creation_disabled_event: Discussioni disabilitate
+      decidim/debates/creation_enabled_event: Discussioni abilitate
+  activerecord:
+    models:
+      decidim/debates/debate:
+        one: Discussione
+        other: dibattiti
   decidim:
     components:
       debates:
@@ -66,9 +75,6 @@ it:
           invalid: C'è stato un problema durante la creazione del dibattito.
           success: Dibattito creato con successo.
         debate:
-          comments:
-            one: Commento
-            other: Commenti
           participate: Partecipare
         filters:
           all: Tutti
@@ -94,9 +100,6 @@ it:
           close_window: Chiudi la finestra
           share: Condividere
           share_link: Condividi il link
-        show:
-          comments: Commenti
-          report: rapporto
       models:
         debate:
           fields:

data/config/locales/nl.yml

@@ -11,6 +11,15 @@ nl:
         start_time: Begint om
         title: Titel
         user_group_id: Maak een debat als
+    models:
+      decidim/debates/create_debate_event: Debat
+      decidim/debates/creation_disabled_event: Debatten uitgeschakeld
+      decidim/debates/creation_enabled_event: Debatten ingeschakeld
+  activerecord:
+    models:
+      decidim/debates/debate:
+        one: Debat
+        other: debatten
   decidim:
     components:
       debates:
@@ -20,7 +29,7 @@ nl:
         settings:
           global:
             announcement: Aankondiging
-            comments_enabled: Reacties geactiveerd
+            comments_enabled: Reacties ingeschakeld
           step:
             announcement: Aankondiging
             comments_blocked: Reacties geblokkeerd
@@ -66,9 +75,6 @@ nl:
           invalid: Er is een probleem opgetreden tijdens het aanmaken van het debat.
           success: Debat succesvol aangemaakt.
         debate:
-          comments:
-            one: Reactie
-            other: Reacties
           participate: Deelnemen
         filters:
           all: Alle
@@ -94,9 +100,6 @@ nl:
           close_window: Sluit venster
           share: Delen
           share_link: Link delen
-        show:
-          comments: Reacties
-          report: Rapporteren
       models:
         debate:
           fields:

data/config/locales/pl.yml

@@ -11,6 +11,17 @@ pl:
         start_time: Zaczyna się o
         title: Tytuł
         user_group_id: Utwórz debatę jako
+    models:
+      decidim/debates/create_debate_event: Debata
+      decidim/debates/creation_disabled_event: Debaty wyłączone
+      decidim/debates/creation_enabled_event: Debaty włączone
+  activerecord:
+    models:
+      decidim/debates/debate:
+        one: Debata
+        few: Debaty
+        many: Debaty
+        other: Debaty
   decidim:
     components:
       debates:
@@ -93,9 +104,6 @@ pl:
           close_window: Zamknij okno
           share: Dzielić
           share_link: Udostępnij link
-        show:
-          comments: Komentarze
-          report: Raport
       models:
         debate:
           fields:

data/config/locales/pt-BR.yml

@@ -11,6 +11,15 @@ pt-BR:
         start_time: Começa em
         title: Título
         user_group_id: Criar debate como
+    models:
+      decidim/debates/create_debate_event: Debate
+      decidim/debates/creation_disabled_event: Debates desativados
+      decidim/debates/creation_enabled_event: Debates ativados
+  activerecord:
+    models:
+      decidim/debates/debate:
+        one: Debate
+        other: Debates
   decidim:
     components:
       debates:
@@ -66,9 +75,6 @@ pt-BR:
           invalid: Houve um problema ao criar o debate.
           success: Debate criado com sucesso.
         debate:
-          comments:
-            one: Comente
-            other: Comentários
           participate: Participar
         filters:
           all: Todos
@@ -94,9 +100,6 @@ pt-BR:
           close_window: Janela fechada
           share: Compartilhar
           share_link: Compartilhar link
-        show:
-          comments: Comentários
-          report: Relatório
       models:
         debate:
           fields:

data/config/locales/pt.yml

@@ -11,6 +11,15 @@ pt:
         start_time: Começa em
         title: Título
         user_group_id: Criar debate como
+    models:
+      decidim/debates/create_debate_event: Debate
+      decidim/debates/creation_disabled_event: Debates desativados
+      decidim/debates/creation_enabled_event: Debates habilitados
+  activerecord:
+    models:
+      decidim/debates/debate:
+        one: Debate
+        other: Debates
   decidim:
     components:
       debates:
@@ -66,9 +75,6 @@ pt:
           invalid: Houve um problema ao criar o debate.
           success: Debate criado com sucesso.
         debate:
-          comments:
-            one: Comente
-            other: Comentários
           participate: Participar
         filters:
           all: Todos
@@ -94,9 +100,6 @@ pt:
           close_window: Janela fechada
           share: Compartilhar
           share_link: Compartilhar link
-        show:
-          comments: Comentários
-          report: Relatório
       models:
         debate:
           fields:

data/config/locales/ru.yml

@@ -4,25 +4,86 @@ ru:
       debate:
         category_id: Разряд
         decidim_category_id: Разряд
+        description: Описание
+        end_time: 'Заканчивается:'
+        information_updates: Обновления сведений
+        instructions: Указания для участия
+        start_time: 'Начинается:'
         title: Название
+        user_group_id: Начать обсуждение в качестве
+    models:
+      decidim/debates/create_debate_event: Обсуждение
+      decidim/debates/creation_disabled_event: Обсуждения отключены
+      decidim/debates/creation_enabled_event: Обсуждения включены
+  activerecord:
+    models:
+      decidim/debates/debate:
+        one: Обсуждение
+        few: Обсуждения
+        many: Обсуждений
+        other: Обсуждений
   decidim:
     components:
       debates:
+        actions:
+          create: Добавить
         name: Обсуждения
     debates:
       actions:
+        confirm_destroy: Вы уверены?
+        destroy: Удалить
+        edit: Редактировать
         new: Добавить %{name}
+        title: Действия
       admin:
         debates:
+          create:
+            invalid: При попытке создать это обсуждение произошла ошибка.
+            success: Обсуждение успешно создано.
+          destroy:
+            success: Обсуждение успешно удалено.
+          edit:
+            title: Редактировать обсуждение
+            update: Обновить обсуждение
           index:
             title: Обсуждения
           new:
+            create: Начать обсуждение
             title: Начать новое обсуждение
+          update:
+            invalid: При попытке обновить это обсуждение произошла ошибка.
+            success: Обсуждение успешно обновлено.
+        models:
+          debate:
+            name: Обсуждение
+      admin_log:
+        debate:
+          create: "%{user_name} создал обсуждение %{resource_name} в пространстве %{space_name}"
+          update: "%{user_name} обновил обсуждение %{resource_name} в пространстве %{space_name}"
       debates:
+        count:
+          debates_count:
+            one: "%{count} обсуждение"
+            few: "%{count} обсуждения"
+            many: "%{count} обсуждений"
+            other: "%{count} обсуждений"
+        create:
+          invalid: При попытке создать это обсуждение произошла ошибка.
+          success: Обсуждение успешно создано.
+        debate:
+          participate: Принять участие
         filters:
+          all: Все
           category: Разряд
           category_prompt: Выберите разряд
+          citizens: Граждане
           official: Служебные
+          origin: Источник
+          search: Поиск
+        filters_small_view:
+          close_modal: Закрыть окошко
+          filter: Отобрать
+          filter_by: 'Отобрать по признаку:'
         index:
           new_debate: Начать новое обсуждение
         new:

data/config/locales/sv.yml

@@ -11,6 +11,15 @@ sv:
         start_time: Börjar vid
         title: Titel
         user_group_id: Skapa debatt som
+    models:
+      decidim/debates/create_debate_event: Debatt
+      decidim/debates/creation_disabled_event: Debatter inaktiverade
+      decidim/debates/creation_enabled_event: Debatter aktiverade
+  activerecord:
+    models:
+      decidim/debates/debate:
+        one: Debatt
+        other: debatter
   decidim:
     components:
       debates:
@@ -66,9 +75,6 @@ sv:
           invalid: Det har varit ett problem under debatten.
           success: Debatt skapades framgångsrikt.
         debate:
-          comments:
-            one: Kommentar
-            other: Kommentarer
           participate: Delta
         filters:
           all: Alla
@@ -94,9 +100,6 @@ sv:
           close_window: Stäng fönstret
           share: Dela
           share_link: Dela länk
-        show:
-          comments: Kommentarer
-          report: Rapportera
       models:
         debate:
           fields:

data/config/locales/uk.yml

@@ -5,12 +5,23 @@ uk:
         category_id: Розряд
         decidim_category_id: Розряд
         description: Опис
-        end_time: 'Завершується:'
+        end_time: 'Закінчується:'
         information_updates: Оновлення відомостей
         instructions: Вказівки до участі
-        start_time: 'Розпочато: '
+        start_time: 'Починається:'
         title: Назва
         user_group_id: Започаткувати обговорення як
+    models:
+      decidim/debates/create_debate_event: Обговорення
+      decidim/debates/creation_disabled_event: Обговорення вимкнене
+      decidim/debates/creation_enabled_event: Обговорення увімкнене
+  activerecord:
+    models:
+      decidim/debates/debate:
+        one: Обговорення
+        few: Обговорення
+        many: Обговорень
+        other: Обговорень
   decidim:
     components:
       debates:
@@ -68,11 +79,6 @@ uk:
           invalid: При спробі започаткувати обговорення сталася помилка.
           success: Обговорення успішно започатковано.
         debate:
-          comments:
-            one: Коментар
-            few: Коментарі
-            many: Коментарів
-            other: Коментарів
           participate: Взяти участь
         filters:
           all: Усі
@@ -98,9 +104,6 @@ uk:
           close_window: Закрити вікно
           share: Поділитися
           share_link: Поділитись посиланням
-        show:
-          comments: Коментарі
-          report: Поскаржитись
       models:
         debate:
           fields:
@@ -120,7 +123,7 @@ uk:
             notification_title: <a href="%{space_path}">%{space_title} </a> розпочав обговорення у <a href="%{resource_path}">%{resource_title}</a>.
           user_followers:
             email_intro: |-
-              Доброго дня!
+              Доброго дня! 
               %{author_name} %{author_nickname}, за яким ви стежите, розпочав нове обговорення. Прочитайте його та зробіть свій внесок:
             email_outro: Ви отримали це сповіщення, тому що ви стежите за %{author_nickname}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
             email_subject: Нове обговорення, започатковане %{author_nickname}

data/lib/decidim/debates/admin_engine.rb

@@ -18,16 +18,6 @@ module Decidim
       def load_seed
         nil
       end
-
-      initializer "decidim_debates.inject_admin_abilities_to_user" do |_app|
-        Decidim.configure do |config|
-          config.admin_abilities += [
-            "Decidim::Debates::Abilities::Admin::AdminAbility",
-            "Decidim::Debates::Abilities::Admin::ParticipatoryProcessAdminAbility",
-            "Decidim::Debates::Abilities::Admin::ParticipatoryProcessModeratorAbility"
-          ]
-        end
-      end
     end
   end
 end

data/lib/decidim/debates/component.rb

@@ -6,6 +6,7 @@ Decidim.register_component(:debates) do |component|
   component.engine = Decidim::Debates::Engine
   component.admin_engine = Decidim::Debates::AdminEngine
   component.icon = "decidim/debates/icon.svg"
+  component.permissions_class_name = "Decidim::Debates::Permissions"
 
   component.on(:before_destroy) do |instance|
     raise StandardError, "Can't remove this component" if Decidim::Debates::Debate.where(component: instance).any?
@@ -26,8 +27,9 @@ Decidim.register_component(:debates) do |component|
     Decidim::Debates::Debate.where(component: components).count
   end
 
-  component.register_resource do |resource|
+  component.register_resource(:debate) do |resource|
     resource.model_class_name = "Decidim::Debates::Debate"
+    resource.card = "decidim/debates/debate"
   end
 
   component.actions = %w(create)

data/lib/decidim/debates/engine.rb

@@ -16,12 +16,6 @@ module Decidim
         root to: "debates#index"
       end
 
-      initializer "decidim_debates.inject_abilities_to_user" do |_app|
-        Decidim.configure do |config|
-          config.abilities += ["Decidim::Debates::Abilities::CurrentUserAbility"]
-        end
-      end
-
       initializer "decidim_changes" do
         Decidim::SettingsChange.subscribe "debates" do |changes|
           Decidim::Debates::SettingsChangeJob.perform_later(
@@ -31,6 +25,11 @@ module Decidim
           )
         end
       end
+
+      initializer "decidim_meetings.add_cells_view_paths" do
+        Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Debates::Engine.root}/app/cells")
+        Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Debates::Engine.root}/app/views") # for partials
+      end
     end
   end
 end

data/lib/decidim/debates/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-debates
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0.pre
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -75,28 +75,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 description: A debates component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -110,6 +110,9 @@ files:
 - README.md
 - Rakefile
 - app/assets/images/decidim/debates/icon.svg
+- app/cells/decidim/debates/debate_cell.rb
+- app/cells/decidim/debates/debate_m/footer.erb
+- app/cells/decidim/debates/debate_m_cell.rb
 - app/commands/decidim/debates/admin/create_debate.rb
 - app/commands/decidim/debates/admin/update_debate.rb
 - app/commands/decidim/debates/create_debate.rb
@@ -123,13 +126,12 @@ files:
 - app/forms/decidim/debates/admin/debate_form.rb
 - app/forms/decidim/debates/debate_form.rb
 - app/helpers/decidim/debates/application_helper.rb
+- app/helpers/decidim/debates/debate_cells_helper.rb
 - app/jobs/decidim/debates/settings_change_job.rb
-- app/models/decidim/debates/abilities/admin/admin_ability.rb
-- app/models/decidim/debates/abilities/admin/participatory_process_admin_ability.rb
-- app/models/decidim/debates/abilities/admin/participatory_process_moderator_ability.rb
-- app/models/decidim/debates/abilities/current_user_ability.rb
 - app/models/decidim/debates/application_record.rb
 - app/models/decidim/debates/debate.rb
+- app/permissions/decidim/debates/admin/permissions.rb
+- app/permissions/decidim/debates/permissions.rb
 - app/presenters/decidim/debates/admin_log/debate_presenter.rb
 - app/presenters/decidim/debates/debate_presenter.rb
 - app/presenters/decidim/debates/official_author_presenter.rb
@@ -192,9 +194,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6

data/app/models/decidim/debates/abilities/admin/admin_ability.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Debates
-    module Abilities
-      module Admin
-        # Defines the abilities related to debates for an admin user.
-        # Intended to be used with `cancancan`.
-        class AdminAbility < Decidim::Abilities::AdminAbility
-          def define_abilities
-            can :manage, Debate do |debate|
-              debate.author.blank?
-            end
-            can :unreport, Debate
-            can :hide, Debate
-          end
-        end
-      end
-    end
-  end
-end

data/app/models/decidim/debates/abilities/admin/participatory_process_admin_ability.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Debates
-    module Abilities
-      module Admin
-        # Defines the abilities related to debates for a logged in process admin user.
-        # Intended to be used with `cancancan`.
-        class ParticipatoryProcessAdminAbility < Decidim::Abilities::ParticipatoryProcessAdminAbility
-          def define_participatory_process_abilities
-            super
-
-            can :manage, Debate do |debate|
-              debate.author.blank?
-            end
-            can :unreport, Debate
-            can :hide, Debate
-          end
-        end
-      end
-    end
-  end
-end

data/app/models/decidim/debates/abilities/admin/participatory_process_moderator_ability.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Debates
-    module Abilities
-      module Admin
-        # Defines the abilities related to Debate for a logged in process admin user.
-        # Intended to be used with `cancancan`.
-        class ParticipatoryProcessModeratorAbility < Decidim::Abilities::ParticipatoryProcessModeratorAbility
-          def define_participatory_process_abilities
-            super
-
-            can [:unreport, :hide], Debate do |debate|
-              can_manage_process?(debate.component.participatory_space)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/app/models/decidim/debates/abilities/current_user_ability.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Debates
-    module Abilities
-      # Defines the abilities related to debates for a logged in user.
-      # Intended to be used with `cancancan`.
-      class CurrentUserAbility
-        include CanCan::Ability
-
-        attr_reader :user, :context
-
-        def initialize(user, context)
-          return unless user
-
-          @user = user
-          @context = context
-
-          can :create, Debate if authorized?(:create) && creation_enabled?
-          can :report, Debate
-        end
-
-        private
-
-        def authorized?(action)
-          return unless component
-
-          ActionAuthorizer.new(user, component, action).authorize.ok?
-        end
-
-        def creation_enabled?
-          return unless current_settings
-          current_settings.creation_enabled?
-        end
-
-        def current_settings
-          context.fetch(:current_settings, nil)
-        end
-
-        def component
-          component = context.fetch(:current_component, nil)
-          return nil unless component && component.manifest.name == :debates
-
-          component
-        end
-      end
-    end
-  end
-end