decidim-blogs 0.28.6 → 0.29.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6e82dfea5aae1d93264baf02a13eb4a2082aa38ebde941acebe9f7afe7cf2e2
-  data.tar.gz: 82a0b32a62daeea067fb380204310bff63c8c5692eae1efac53f9f32225e6d99
+  metadata.gz: 2d3e05fbe48097df47ffc82f4b2ebbde3fc54a955c8d2b2df9b56b38f75d1014
+  data.tar.gz: 0f053312ab155c859de24f3f0249876f301bedb5339eaa8ce5e82a49a9397d84
 SHA512:
-  metadata.gz: 9684b890f314e976797e284c3dbbf6f12c404609e91318cde4ef6b3a53389f9af8ab5e1ee39355db8c7eddefc2b92d9083b1765eb3e4355b501620fe9c2ec929
-  data.tar.gz: 613b00cc1f75d5b7cad76774751cbcd43ed42e9642bf487b93474645995bb06c23f955d2ab452ee3e6fb12698436408d6cb6c853c763a8f3837f6215a50945a3
+  metadata.gz: 0a46ed37e62404b0a957b8d4ac280233e34643f03d28f7248274539570a5dab1e43e459ee77ce2102f656b37fc9eb10c3f3a410b61b4f0cf56af58480aa7525f
+  data.tar.gz: b4fa8aea088a2ad4d7b68dd92e03028cfb88bc9ea97cb3ed845b7600b0df575116e2b9ad0d57d33c9cc3f1e9c263996b9311db0058c594252ec330641c91e836

data/app/cells/decidim/blogs/post_g_cell.rb

@@ -9,6 +9,10 @@ module Decidim
 
       private
 
+      def has_image?
+        resource_image_path.present?
+      end
+
       def show_description?
         true
       end
@@ -17,7 +21,7 @@ module Decidim
         "decidim/blogs/post_metadata_g"
       end
 
-      def resource_image_url
+      def resource_image_path
         return if photo.blank?
 
         photo.url

data/app/cells/decidim/blogs/post_l_cell.rb

@@ -9,6 +9,10 @@ module Decidim
 
       private
 
+      def has_image?
+        true
+      end
+
       def has_description?
         true
       end
@@ -21,7 +25,7 @@ module Decidim
         "decidim/blogs/post_metadata"
       end
 
-      def resource_image_url
+      def resource_image_path
         return if photo.blank?
 
         photo.url

data/app/commands/decidim/blogs/admin/create_post.rb

@@ -5,51 +5,21 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Post from the admin
       # panel.
-      class CreatePost < Decidim::Command
-        def initialize(form, current_user)
-          @form = form
-          @current_user = current_user
-        end
-
-        # Creates the post if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if @form.invalid?
-
-          transaction do
-            create_post!
-            send_notification
-          end
-
-          broadcast(:ok, @post)
-        end
+      class CreatePost < Decidim::Commands::CreateResource
+        fetch_form_attributes :title, :body, :published_at, :author, :component
 
         private
 
-        def create_post!
-          attributes = {
-            title: @form.title,
-            body: @form.body,
-            published_at: @form.published_at,
-            component: @form.current_component,
-            author: @form.author
-          }
+        def resource_class = Decidim::Blogs::Post
 
-          @post = Decidim.traceability.create!(
-            Post,
-            @current_user,
-            attributes,
-            visibility: "all"
-          )
-        end
+        def extra_params = { visibility: "all" }
 
-        def send_notification
+        def run_after_hooks
           Decidim::EventsManager.publish(
             event: "decidim.events.blogs.post_created",
             event_class: Decidim::Blogs::CreatePostEvent,
-            resource: @post,
-            followers: @post.participatory_space.followers
+            resource:,
+            followers: resource.participatory_space.followers
           )
         end
       end

data/app/commands/decidim/blogs/admin/update_post.rb

@@ -3,51 +3,15 @@
 module Decidim
   module Blogs
     module Admin
-      # This command is executed when the user changes a Blog from the admin
+      # This command is executed when the user changes a Post from the admin
       # panel.
-      class UpdatePost < Decidim::Command
-        # Initializes a UpdateBlog Command.
-        #
-        # form - The form from which to get the data.
-        # blog - The current instance of the page to be updated.
-        def initialize(form, post, user)
-          @form = form
-          @post = post
-          @user = user
-        end
-
-        # Updates the blog if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          transaction do
-            update_post!
-          end
-
-          broadcast(:ok, post)
-        end
+      class UpdatePost < Decidim::Commands::UpdateResource
+        fetch_form_attributes :title, :body, :author
 
         private
 
-        attr_reader :form, :post
-
-        def update_post!
-          Decidim.traceability.update!(
-            post,
-            @user,
-            attributes
-          )
-        end
-
         def attributes
-          {
-            title: form.title,
-            body: form.body,
-            published_at: form.published_at,
-            author: form.author
-          }.reject do |attribute, value|
+          super.merge(published_at: form.published_at).reject do |attribute, value|
             value.blank? && attribute == :published_at
           end
         end

data/app/controllers/decidim/blogs/admin/posts_controller.rb

@@ -17,7 +17,7 @@ module Decidim
           enforce_permission_to :create, :blogpost
           @form = form(PostForm).from_params(params, current_component:)
 
-          CreatePost.call(@form, current_user) do
+          CreatePost.call(@form) do
             on(:ok) do
               flash[:notice] = I18n.t("posts.create.success", scope: "decidim.blogs.admin")
               redirect_to posts_path
@@ -39,7 +39,7 @@ module Decidim
           enforce_permission_to :update, :blogpost, blogpost: post
           @form = form(PostForm).from_params(params, current_component:)
 
-          UpdatePost.call(@form, post, current_user) do
+          UpdatePost.call(@form, post) do
             on(:ok) do
               flash[:notice] = I18n.t("posts.update.success", scope: "decidim.blogs.admin")
               redirect_to posts_path
@@ -55,13 +55,12 @@ module Decidim
         def destroy
           enforce_permission_to :destroy, :blogpost, blogpost: post
 
-          Decidim.traceability.perform_action!("delete", post, current_user) do
-            post.destroy!
+          Decidim::Commands::DestroyResource.call(post, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("posts.destroy.success", scope: "decidim.blogs.admin")
+              redirect_to posts_path
+            end
           end
-
-          flash[:notice] = I18n.t("posts.destroy.success", scope: "decidim.blogs.admin")
-
-          redirect_to posts_path
         end
 
         private

data/app/forms/decidim/blogs/admin/post_form.rb

@@ -8,7 +8,7 @@ module Decidim
         include TranslatableAttributes
 
         translatable_attribute :title, String
-        translatable_attribute :body, Decidim::Attributes::RichText
+        translatable_attribute :body, String
 
         attribute :decidim_author_id, Integer
         attribute :published_at, Decidim::Attributes::TimeWithZone

data/app/helpers/decidim/blogs/admin/posts_helper.rb

@@ -22,7 +22,7 @@ module Decidim
 
         def post_author_select_field(form, name, _options = {})
           select_options = [
-            [current_organization.name, ""],
+            [current_organization_name, ""],
             [current_user.name, current_user.id]
           ]
           current_user_groups = Decidim::UserGroups::ManageableUserGroups.for(current_user).verified

data/app/models/decidim/blogs/post.rb

@@ -86,6 +86,11 @@ module Decidim
         :admin
       end
 
+      # Public: Overrides the `reported_content_url` Reportable concern method.
+      def reported_content_url
+        ResourceLocatorPresenter.new(self).url
+      end
+
       # Public: Overrides the `reported_attributes` Reportable concern method.
       def reported_attributes
         [:title, :body]

data/app/views/decidim/blogs/admin/posts/_form.html.erb

@@ -2,9 +2,7 @@
   <div class="card pt-4">
     <div class="card-section">
       <div class="row column">
-        <div class="field">
           <%= post_author_select_field form, :decidim_author_id, label: t("decidim.blogs.actions.author_id") %>
-        </div>
       </div>
 
       <div class="row column">

data/app/views/decidim/blogs/admin/posts/index.html.erb

@@ -15,7 +15,7 @@
           <th><%= t("models.post.fields.body", scope: "decidim.blogs") %></th>
           <th><%= t("models.post.fields.author", scope: "decidim.blogs") %></th>
           <th><%= t("models.post.fields.published_at", scope: "decidim.blogs") %></th>
-          <th class="actions"><%= t("actions.title", scope: "decidim.blogs") %></th>
+          <th><%= t("actions.title", scope: "decidim.blogs") %></th>
         </tr>
       </thead>
       <tbody>
@@ -33,7 +33,7 @@
               <%= decidim_sanitize_editor post_description_admin(post) %>
             </td>
             <td>
-              <%= post.try(:author).try(:name) %>
+              <%= translated_attribute(post.try(:author).try(:name)) %>
             </td>
             <% publish_data = publish_data(post.published_at) %>
             <td>

data/app/views/decidim/blogs/posts/index.html.erb

@@ -1,12 +1,4 @@
-<% add_decidim_meta_tags(
-  description: translated_attribute(current_component.participatory_space.try(:description)),
-  title: t("decidim.components.pagination.page_title",
-           component_name:,
-           current_page: paginate_posts.current_page,
-           total_pages: paginate_posts.total_pages ),
-  url: posts_url,
-  resource: current_component) %>
-
+<% add_decidim_page_title component_name %>
 <%= append_javascript_pack_tag "decidim_blogs" %>
 <%= append_stylesheet_pack_tag "decidim_blogs" %>
 

data/config/locales/ar.yml

@@ -22,6 +22,7 @@ ar:
     blogs:
       actions:
         author_id: إنشاء مشاركة كـ
+        confirm_destroy: هل أنت متأكد أنك تريد حذف هذه المشاركة؟
         destroy: حذف
         edit: تعديل
         new: منشور جديد
@@ -43,9 +44,6 @@ ar:
           create: "%{user_name} أنشأ منشور المدونة %{resource_name} في %{space_name}"
           delete: "%{user_name} حذف منشور المدونة%{resource_name} من %{space_name}"
           update: "%{user_name} حدث منشور المدونة %{resource_name} في %{space_name}"
-      content_blocks:
-        highlighted_posts:
-          name: المنشورات
       last_activity:
         new_post: 'منشور جديد:'
       models:

data/config/locales/bg.yml

@@ -18,6 +18,7 @@ bg:
     blogs:
       actions:
         author_id: Създаване на публикация като
+        confirm_destroy: Сигурни ли сте, че желаете да изтриете тази публикация?
         destroy: Изтрий
         edit: Редактирай
         new: Нова публикация

data/config/locales/ca.yml

@@ -19,7 +19,7 @@ ca:
       actions:
         author_id: Crear publicació com
         confirm_destroy: Segur que vols eliminar aquesta publicació?
-        destroy: Esborrar
+        destroy: Suprimeix
         edit: Edita
         new: Nova publicació
         title: Accions

data/config/locales/cs.yml

@@ -20,7 +20,7 @@ cs:
     blogs:
       actions:
         author_id: Vytvořit příspěvek jako
-        confirm_destroy: Opravdu chcete odstranit tento příspěvek?
+        confirm_destroy: Opravdu chcete tento příspěvek smazat?
         destroy: Smazat
         edit: Upravit
         new: Nový příspěvek

data/config/locales/el.yml

@@ -18,6 +18,7 @@ el:
     blogs:
       actions:
         author_id: Δημιουργία ανάρτησης ως
+        confirm_destroy: Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν τη δημοσίευση;
         destroy: Διαγραφή
         edit: Επεξεργασία
         new: Νέα δημοσίευση

data/config/locales/es-MX.yml

@@ -67,7 +67,7 @@ es-MX:
           count:
             one: "%{count} publicación"
             other: "%{count} publicaciones"
-          empty: Aún no hay publicaciones.
+          empty: Aún no hay ninguna publicación.
     components:
       blogs:
         actions:

data/config/locales/es-PY.yml

@@ -67,7 +67,7 @@ es-PY:
           count:
             one: "%{count} publicación"
             other: "%{count} publicaciones"
-          empty: Aún no hay publicaciones.
+          empty: Aún no hay ninguna publicación.
     components:
       blogs:
         actions:

data/config/locales/es.yml

@@ -67,7 +67,7 @@ es:
           count:
             one: "%{count} publicación"
             other: "%{count} publicaciones"
-          empty: Aún no hay publicaciones.
+          empty: Aún no hay ninguna publicación.
     components:
       blogs:
         actions:

data/config/locales/eu.yml

@@ -18,7 +18,7 @@ eu:
     blogs:
       actions:
         author_id: Sortu argitalpena hau bezala
-        confirm_destroy: Ziur zaude korreo elektronikoa hau ezabatu nahi duzula?
+        confirm_destroy: Ziur zaude post hau argitalpen ezabatu nahi duzula?
         destroy: Ezabatu
         edit: Editatu
         new: Beste argitalpen bat
@@ -44,9 +44,9 @@ eu:
             success: Argitalpena zuzen gordea.
       admin_log:
         post:
-          create: "%{user_name} parte-hartzailekak %{resource_name} blogeko argitalpena sortu du %{space_name} espazioan"
-          delete: "%{user_name} parte-hartzailekak %{resource_name} blogeko argitalpena ezabatu du %{space_name} espazioan"
-          update: "%{user_name} parte-hartzailekak %{resource_name} blogeko argitalpena eguneratu egin da %{space_name} espazioan"
+          create: "%{user_name} k %{resource_name} blogeko argitalpena sortu du %{space_name} espazioan"
+          delete: "%{user_name} k %{resource_name} blogeko argitalpena ezabatu du %{space_name} espazioan"
+          update: "%{user_name} k %{resource_name} blogeko argitalpena eguneratu egin da %{space_name} espazioan"
       content_blocks:
         highlighted_posts:
           last_published: Azken argitarapena
@@ -65,8 +65,8 @@ eu:
       posts:
         index:
           count:
-            one: "Argitalpen %{count}"
-            other: "%{count} argitalpen"
+            one: "%{count} argitalpen"
+            other: "%{count} edukin"
           empty: Oraindik ez dago argitalpenik.
     components:
       blogs:
@@ -93,6 +93,6 @@ eu:
           email_intro: '"%{resource_title}" argitalpena jarraitzen ari zaren "%{participatory_space_title}" espazioan argitaratu da.'
           email_outro: Jakinarazpena jaso duzu "%{participatory_space_title}" jarraitzen ari zarelako. Aurreko estekan utzi ahal diozu jarraitzeari.
           email_subject: Argitalpen berria %{participatory_space_title} espazioan
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> sarrera %{participatory_space_title} argitaratu da
+          notification_title: <a href="%{resource_path}">%{resource_title}</a> posta %{participatory_space_title} argitaratu da
     statistics:
       posts_count: Argitalpenak

data/config/locales/fr-CA.yml

@@ -18,7 +18,7 @@ fr-CA:
     blogs:
       actions:
         author_id: Créer un article comme
-        confirm_destroy: Êtes-vous sûr(e) de vouloir supprimer cet article ?
+        confirm_destroy: Êtes-vous certain de vouloir supprimer cet article ?
         destroy: Supprimer
         edit: Modifier
         new: Nouvel article

data/config/locales/fr.yml

@@ -18,7 +18,7 @@ fr:
     blogs:
       actions:
         author_id: Créer un article en tant que
-        confirm_destroy: Êtes-vous sûr(e) de vouloir supprimer cet article ?
+        confirm_destroy: Êtes-vous certain de vouloir supprimer cet article ?
         destroy: Supprimer
         edit: Modifier
         new: Nouvel article

data/config/locales/ga-IE.yml

@@ -11,6 +11,7 @@ ga:
   decidim:
     blogs:
       actions:
+        destroy: Scrios
         edit: Eagar
         new: Postáil nua
         title: Gníomhartha

data/config/locales/gl.yml

@@ -12,6 +12,7 @@ gl:
     blogs:
       actions:
         author_id: Crear publicación como
+        confirm_destroy: Tes a certeza de querer eliminar esta publicación?
         destroy: Eliminar
         edit: Editar
         new: Nova publicación

data/config/locales/hu.yml

@@ -18,6 +18,7 @@ hu:
     blogs:
       actions:
         author_id: Bejegyzés létrehozása
+        confirm_destroy: Biztos, hogy törlöd ezt a bejegyzést?
         destroy: Törlés
         edit: Szerkesztés
         new: Új bejegyzés

data/config/locales/id-ID.yml

@@ -10,6 +10,8 @@ id:
   decidim:
     blogs:
       actions:
+        confirm_destroy: Anda yakin ingin menghapus posting ini?
+        destroy: Menghapus
         edit: Edit
         new: Berita Baru
         title: Tindakan

data/config/locales/is-IS.yml

@@ -3,6 +3,8 @@ is:
   decidim:
     blogs:
       actions:
+        confirm_destroy: Ertu viss um að þú viljir eyða þessu færslu?
+        destroy: Eyða
         edit: Breyta
         title: Aðgerðir
       admin:

data/config/locales/it.yml

@@ -12,6 +12,8 @@ it:
     blogs:
       actions:
         author_id: Crea post come
+        confirm_destroy: Sei sicuro di voler eliminare questo post?
+        destroy: Elimina
         edit: Modifica
         new: Nuovo post
         title: Azioni

data/config/locales/ko.yml

@@ -8,6 +8,7 @@ ko:
   decidim:
     blogs:
       actions:
+        destroy: 삭제
         edit: 수정
         new: 새 게시물
         title: 작업

data/config/locales/lb.yml

@@ -12,6 +12,8 @@ lb:
     blogs:
       actions:
         author_id: Beitrag erstellen als
+        confirm_destroy: Möchten Sie diesen Beitrag wirklich löschen?
+        destroy: Löschen
         edit: Bearbeiten
         new: Neuer Beitrag
         title: Aktionen

data/config/locales/lt.yml

@@ -20,6 +20,7 @@ lt:
     blogs:
       actions:
         author_id: Sukurti įrašą kaip
+        confirm_destroy: Ar tikrai norite ištrinti šį įrašą?
         destroy: Ištrinti
         edit: Redaguoti
         new: Naujas įrašas

data/config/locales/lv.yml

@@ -12,6 +12,8 @@ lv:
   decidim:
     blogs:
       actions:
+        confirm_destroy: Vai tiešām vēlaties dzēst šo ziņu?
+        destroy: Dzēst
         edit: Labot
         new: Jauna ziņa
         title: Darbības

data/config/locales/nl.yml

@@ -12,7 +12,8 @@ nl:
     blogs:
       actions:
         author_id: Bericht aanmaken als
-        destroy: Verwijderen
+        confirm_destroy: Weet je zeker dat je dit bericht wilt verwijderen?
+        destroy: Verwijder
         edit: Bewerk
         new: Nieuwe blogpost
         title: acties

data/config/locales/no.yml

@@ -12,6 +12,7 @@
     blogs:
       actions:
         author_id: Opprett innlegg som
+        confirm_destroy: Er du sikker på at du vil slette dette innlegget?
         destroy: Slett
         edit: Editar
         new: Nytt innlegg

data/config/locales/pl.yml

@@ -20,6 +20,7 @@ pl:
     blogs:
       actions:
         author_id: Utwórz wpis jako
+        confirm_destroy: Czy na pewno chcesz usunąć ten wpis?
         destroy: Usuń
         edit: Edytuj
         new: Nowy wpis

data/config/locales/pt-BR.yml

@@ -18,6 +18,7 @@ pt-BR:
     blogs:
       actions:
         author_id: Criar publicação como
+        confirm_destroy: Deseja mesmo excluir este post?
         destroy: Excluir
         edit: Editar
         new: Nova postagem

data/config/locales/pt.yml

@@ -1,12 +1,6 @@
 ---
 pt:
   activemodel:
-    attributes:
-      post:
-        body: Corpo
-        decidim_author_id: Autor
-        published_at: Hora de publicação
-        title: Título
     models:
       decidim/blogs/create_post_event: Nova publicação no blog
   activerecord:
@@ -18,62 +12,33 @@ pt:
     blogs:
       actions:
         author_id: Criar publicação como
-        confirm_destroy: Tem a certeza de que quer eliminar esta publicação?
+        confirm_destroy: Tem a certeza de que deseja eliminar esta publicação?
         destroy: Eliminar
         edit: Editar
         new: Nova publicação
         title: Ações
       admin:
         posts:
-          create:
-            invalid: Ocorreu um problema ao criar esta publicação.
-            success: Publicação criada corretamente.
           edit:
             save: Actualizar
             title: Editar publicação
           index:
-            not_published_yet: Ainda não publicado
             title: Publicações
           new:
             create: Criar
             title: Criar publicação
           update:
             invalid: Ocorreu um problema ao guardar a publicação.
-            success: Publicação guardada corretamente.
-      admin_log:
-        post:
-          create: "%{user_name} criou a publicação %{resource_name} no espaço %{space_name}"
-          delete: "%{user_name} eliminou a publicação %{resource_name} no espaço %{space_name}"
-          update: "%{user_name} atualizou a publicação %{resource_name} no espaço %{space_name}"
-      content_blocks:
-        highlighted_posts:
-          last_published: Última publicação
-          name: Publicações
-          see_all: Ver todas as publicações
-      last_activity:
-        new_post: 'Nova publicação:'
       models:
         post:
           fields:
             author: Autor
             body: Corpo
-            official_blog_post: Publicação oficial
-            published_at: Hora de publicação
-            title: Título
-      posts:
-        index:
-          count:
-            one: "%{count} publicação"
-            other: "%{count} publicações"
-          empty: Ainda não há publicações.
     components:
       blogs:
         actions:
           comment: Comentar
-          create: Criar
-          destroy: Eliminar
           endorse: Apoiar
-          update: Atualizar
         name: Blog
         settings:
           global: