decidim-blogs 0.26.8 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0d1caa91870d55a12dd8b07b1f617be7ef213118695441afd080d8a971aba19
-  data.tar.gz: b81b05b0ca02a6363701515becdad6d68a66a07b7370b39850a3abd905918609
+  metadata.gz: 88768c7f46aed92952e6f183bee4e4bab6fb48f8115a5153c4ae05fdbd35412e
+  data.tar.gz: 1dd3686bc2bf1aa6b5e11de03036cf074b18cae89899b4f2628f114cdb2cda07
 SHA512:
-  metadata.gz: c58a58cb86cbd2012ab675a4204687d90c2d8276239db97aba7fc1ac5f222fd4a6dc3053e6c22f22c8dabf9cb3be27cefec6adce62e859223dc320ab5154c465
-  data.tar.gz: 75b6988062ffe1486d75a0515e611d393d74ecd01b63ef89d027bd108c48f502e2c7743eb9476e872a03bc6f5bcfbcfd61ff8173be6d9cc8312aebdb11d7ea5b
+  metadata.gz: 7996256e0b234c48573fec40afb363224d8c22bdf6cee5eae3a7c3cfccb276124529aa304331226ad21412c7951d162708dfbd489b635df34b46ee8f6daf46ec
+  data.tar.gz: d9f1b715694ed3414c299cab3eb2b75018fd2fa37ed344cc672181b4156572a735438b8866aa8d4a46216d341fab71b73ffce57d85f893e647309af86f488af1

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Post from the admin
       # panel.
-      class CreatePost < Rectify::Command
+      class CreatePost < Decidim::Command
         def initialize(form, current_user)
           @form = form
           @current_user = current_user

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

@@ -5,14 +5,15 @@ module Decidim
     module Admin
       # This command is executed when the user changes a Blog from the admin
       # panel.
-      class UpdatePost < Rectify::Command
+      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)
+        def initialize(form, post, user)
           @form = form
           @post = post
+          @user = user
         end
 
         # Updates the blog if valid.
@@ -33,7 +34,9 @@ module Decidim
         attr_reader :form, :post
 
         def update_post!
-          post.update!(
+          Decidim.traceability.update!(
+            post,
+            @user,
             title: form.title,
             body: form.body,
             author: form.author

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

@@ -6,6 +6,7 @@ module Decidim
       # This controller allows the create or update a blog.
       class PostsController < Admin::ApplicationController
         helper UserGroupHelper
+        helper PostsHelper
 
         def new
           enforce_permission_to :create, :blogpost
@@ -38,7 +39,7 @@ module Decidim
           enforce_permission_to :update, :blogpost, blogpost: post
           @form = form(PostForm).from_params(params, current_component: current_component)
 
-          UpdatePost.call(@form, post) do
+          UpdatePost.call(@form, post, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("posts.update.success", scope: "decidim.blogs.admin")
               redirect_to posts_path
@@ -53,7 +54,10 @@ module Decidim
 
         def destroy
           enforce_permission_to :destroy, :blogpost, blogpost: post
-          post.destroy!
+
+          Decidim.traceability.perform_action!("delete", post, current_user) do
+            post.destroy!
+          end
 
           flash[:notice] = I18n.t("posts.destroy.success", scope: "decidim.blogs.admin")
 

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

@@ -10,24 +10,44 @@ module Decidim
         translatable_attribute :title, String
         translatable_attribute :body, String
 
-        attribute :user_group_id, Integer
+        attribute :decidim_author_id, Integer
 
         validates :title, translatable_presence: true
         validates :body, translatable_presence: true
+        validate :can_set_author
 
-        def map_model(post)
-          self.user_group_id = post.author.id if post.author.is_a?(Decidim::UserGroup)
+        def map_model(model)
+          self.decidim_author_id = nil if model.author.is_a? Decidim::Organization
         end
 
-        def user_group
-          @user_group ||= Decidim::UserGroup.find_by(
+        def user_or_group
+          @user_or_group ||= Decidim::UserBaseEntity.find_by(
             organization: current_organization,
-            id: user_group_id.to_i
+            id: decidim_author_id
           )
         end
 
         def author
-          user_group || current_user
+          user_or_group || current_organization
+        end
+
+        private
+
+        def can_set_author
+          return if author == current_user.organization
+          return if author == current_user
+          return if user_groups.include? author
+          return if author == post&.author
+
+          errors.add(:decidim_author_id, :invalid)
+        end
+
+        def post
+          @post ||= Post.find_by(id: id)
+        end
+
+        def user_groups
+          @user_groups ||= Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
         end
       end
     end

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

@@ -18,6 +18,21 @@ module Decidim
           body = translated_attribute(post.body)
           CGI.unescapeHTML html_truncate(body, max_length: max_length)
         end
+
+        def post_author_select_field(form, name, _options = {})
+          select_options = [
+            [current_organization.name, ""],
+            [current_user.name, current_user.id]
+          ]
+          current_user_groups = Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
+
+          select_options += current_user_groups.map { |g| [g.name, g.id] } if current_organization.user_groups_enabled? && current_user_groups.any?
+          unless form.object.author.is_a?(Organization) || select_options.pluck(1).include?(form.object.author.id)
+            select_options << [form.object.author.name, form.object.author.id]
+          end
+
+          form.select(name, select_options)
+        end
       end
     end
   end

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

@@ -14,7 +14,6 @@ module Decidim
       include Decidim::Searchable
       include Decidim::Endorsable
       include Decidim::Followable
-      include Decidim::Reportable
       include Decidim::TranslatableResource
       include Traceable
       include Loggable
@@ -40,6 +39,10 @@ module Decidim
         participatory_space.try(:visible?) && component.try(:published?)
       end
 
+      def self.log_presenter_class_for(_log)
+        Decidim::Blogs::AdminLog::PostPresenter
+      end
+
       # Public: Overrides the `comments_have_alignment?` Commentable concern method.
       def comments_have_alignment?
         true
@@ -56,7 +59,11 @@ module Decidim
       end
 
       def official?
-        author.nil?
+        author.is_a?(Decidim::Organization)
+      end
+
+      def user_group?
+        author.is_a?(Decidim::UserGroup)
       end
 
       def users_to_notify_on_comment_created
@@ -66,21 +73,6 @@ module Decidim
       def attachment_context
         :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]
-      end
-
-      # Public: Overrides the `reported_searchable_content_extras` Reportable concern method.
-      def reported_searchable_content_extras
-        [normalized_author.name]
-      end
     end
   end
 end

data/app/presenters/decidim/blogs/admin_log/post_presenter.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Blogs::Post`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    PostPresenter.new(action_log, view_helpers).present
+      class PostPresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "create", "delete", "update"
+            "decidim.blogs.admin_log.post.#{action}"
+          else
+            super
+          end
+        end
+
+        def diff_fields_mapping
+          {
+            title: :i18n,
+            body: :i18n
+          }
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/blogs/official_author_presenter.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    #
+    # A dummy presenter to abstract out the author of an official post.
+    #
+    class OfficialAuthorPresenter < Decidim::OfficialAuthorPresenter
+      def name
+        I18n.t("decidim.blogs.models.post.fields.official_blog_post")
+      end
+    end
+  end
+end

data/app/presenters/decidim/blogs/post_presenter.rb

@@ -7,7 +7,13 @@ module Decidim
     #
     class PostPresenter < SimpleDelegator
       def author
-        @author ||= Decidim::UserPresenter.new(super)
+        @author ||= if official?
+                      Decidim::Blogs::OfficialAuthorPresenter.new
+                    elsif user_group?
+                      Decidim::UserGroupPresenter.new(super)
+                    else
+                      Decidim::UserPresenter.new(super)
+                    end
       end
     end
   end

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

@@ -3,16 +3,16 @@
     <h2 class="card-title"><%= title %></h2>
   </div>
   <div class="card-section">
-    <% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
+
       <div class="field">
-        <%= user_group_select_field form, :user_group_id, label: t("decidim.blogs.actions.user_group_id") %>
+        <%= post_author_select_field form, :decidim_author_id, label: t("decidim.blogs.actions.author_id") %>
       </div>
-    <% end %>
+
     <div class="row column">
       <%= form.translated :text_field, :title, autofocus: true %>
     </div>
     <div class="row column">
-      <%= form.translated :editor, :body, lines: 30 %>
+      <%= form.translated :editor, :body, toolbar: :full, lines: 30, label: t("models.components.body", scope: "decidim.blogs.admin") %>
     </div>
   </div>
 </div>

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for(@form, html: { class: "form edit_post" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for(@form, html: { class: "form new_post" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

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

@@ -12,7 +12,8 @@
           </h2>
           <% end %>
           <div class="card__author">
-            <%= cell "decidim/author", present(post.author), from: post, has_actions: true %>
+            <% post_presenter = Decidim::Blogs::PostPresenter.new(post) %>
+            <%= cell "decidim/author", post_presenter.author, from: post, has_actions: true %>
           </div>
         </div>
         <%= decidim_sanitize_editor post_description(post) %>

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

@@ -23,7 +23,9 @@
     <% end %>
   </div>
   <h2 class="heading2"><%= translated_attribute post.title %></h2>
-  <%= cell "decidim/author", present(post.author), from: post %>
+
+  <% post_presenter = Decidim::Blogs::PostPresenter.new(post) %>
+  <%= cell "decidim/author", post_presenter.author, from: post %>
 </div>
 <div class="row">
   <% if show_endorsements_card? %>
@@ -50,11 +52,10 @@
   <% end %>
   <div class="columns mediumlarge-8 <%= "mediumlarge-pull-4" if show_endorsements_card? %>">
     <div class="section">
-      <%= decidim_sanitize_editor_admin translated_attribute post.body %>
+      <%= decidim_sanitize_editor translated_attribute post.body %>
     </div>
     <%= cell "decidim/endorsers_list", post %>
   </div>
 </div>
 <%= attachments_for post %>
 <%= comments_for post %>
-<%= cell("decidim/flag_modal", post) %>

data/config/locales/am-ET.yml

@@ -1 +1,2 @@
+---
 am:

data/config/locales/ar.yml

@@ -1,11 +1,6 @@
+---
 ar:
   activemodel:
-    attributes:
-      post:
-        body: النص
-        decidim_author_id: المؤلف
-        published_at: موعد النشر
-        title: العنوان
     models:
       decidim/blogs/create_post_event: بلوق وظيفة جديدة
   activerecord:
@@ -20,14 +15,16 @@ ar:
   decidim:
     blogs:
       actions:
+        author_id: إنشاء مشاركة كـ
         confirm_destroy: هل أنت متأكد أنك تريد حذف هذه المشاركة؟
         destroy: حذف
         edit: تعديل
         new: منشور جديد
         title: أفعال
-        user_group_id: إنشاء مشاركة كـ
       admin:
         models:
+          components:
+            body: الجسم
           post:
             name: بريد
         posts:
@@ -55,7 +52,7 @@ ar:
             author: مؤلف
             body: الجسم
             created_at: أنشئت في
-            title: العنوان
+            title: عنوان
       posts:
         show:
           back: العودة إلى القائمة
@@ -68,10 +65,8 @@ ar:
     components:
       blogs:
         actions:
-          comment: التعليق
           create: إنشاء
           destroy: حذف
-          endorse: تأييد
           update: تحديث
         name: مدونة
         settings:

data/config/locales/bg.yml

@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     models:

data/config/locales/ca.yml

@@ -1,11 +1,6 @@
+---
 ca:
   activemodel:
-    attributes:
-      post:
-        body: Cos del text
-        decidim_author_id: Autoria
-        published_at: Hora de publicació
-        title: Títol
     models:
       decidim/blogs/create_post_event: Nova publicació al blog
   activerecord:
@@ -16,14 +11,16 @@ ca:
   decidim:
     blogs:
       actions:
-        confirm_destroy: Segur que vols eliminar aquesta publicació?
+        author_id: Crear publicació com
+        confirm_destroy: Estàs segura que vols eliminar aquesta publicació?
         destroy: Suprimeix
         edit: Edita
         new: Nova publicació
         title: Accions
-        user_group_id: Crear publicació com
       admin:
         models:
+          components:
+            body: Cos
           post:
             name: Publicar
         posts:
@@ -43,6 +40,11 @@ ca:
           update:
             invalid: S'ha produït un error en guardar la publicació.
             success: S'ha desat la publicació correctament
+      admin_log:
+        post:
+          create: "%{user_name} ha creat el post %{resource_name} al blog de %{space_name}"
+          delete: "%{user_name} ha eliminat el post %{resource_name} del blog de %{space_name}"
+          update: "%{user_name} ha actualitzat el post %{resource_name} en el blog de %{space_name}"
       last_activity:
         new_post_at_html: "<span>Nova publicació a %{link}</span>"
       models:
@@ -51,7 +53,8 @@ ca:
             author: Autora
             body: Cos
             created_at: Creat el
-            title: Títol
+            official_blog_post: Post oficial
+            title: títol
       posts:
         show:
           back: Tornar al llistat
@@ -64,10 +67,8 @@ ca:
     components:
       blogs:
         actions:
-          comment: Comentar
           create: Crear
           destroy: Esborrar
-          endorse: Adherir-se
           update: Actualitzar
         name: Blog
         settings:

data/config/locales/cs.yml

@@ -1,11 +1,6 @@
+---
 cs:
   activemodel:
-    attributes:
-      post:
-        body: Tělo zprávy
-        decidim_author_id: Autor
-        published_at: Čas zveřejnění
-        title: Název
     models:
       decidim/blogs/create_post_event: Nový blogový příspěvek
   activerecord:
@@ -18,14 +13,16 @@ cs:
   decidim:
     blogs:
       actions:
+        author_id: Vytvořit příspěvek jako
         confirm_destroy: Opravdu chcete tento příspěvek smazat?
         destroy: Smazat
         edit: Upravit
         new: Nový příspěvek
         title: Akce
-        user_group_id: Vytvořit příspěvek jako
       admin:
         models:
+          components:
+            body: Tělo
           post:
             name: Příspěvek
         posts:
@@ -45,6 +42,11 @@ cs:
           update:
             invalid: Při ukládání příspěvku došlo k chybám.
             success: Příspěvek byl úspěšně uložen
+      admin_log:
+        post:
+          create: "%{user_name} vytvořil příspěvek %{resource_name} v %{space_name}"
+          delete: "%{user_name} odstranil příspěvek %{resource_name} z %{space_name}"
+          update: "%{user_name} aktualizoval příspěvek %{resource_name} v %{space_name}"
       last_activity:
         new_post_at_html: "<span>Nový příspěvek v %{link}</span>"
       models:
@@ -53,7 +55,8 @@ cs:
             author: Autor
             body: Tělo
             created_at: Vytvořeno v
-            title: Název
+            official_blog_post: Oficiální příspěvek
+            title: titulek
       posts:
         show:
           back: Zpět na seznam
@@ -66,10 +69,8 @@ cs:
     components:
       blogs:
         actions:
-          comment: Komentář
           create: Vytvořit
           destroy: Smazat
-          endorse: Schválit
           update: Aktualizovat
         name: Blog
         settings:

data/config/locales/da.yml

@@ -1 +1,2 @@
+---
 da:

data/config/locales/de.yml

@@ -1,11 +1,6 @@
+---
 de:
   activemodel:
-    attributes:
-      post:
-        body: Haupttext
-        decidim_author_id: Autor*in
-        published_at: Veröffentlicht am
-        title: Titel
     models:
       decidim/blogs/create_post_event: Neuer Blogeintrag
   activerecord:
@@ -16,14 +11,16 @@ de:
   decidim:
     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
-        user_group_id: Beitrag erstellen als
       admin:
         models:
+          components:
+            body: Haupttext
           post:
             name: Post
         posts:
@@ -64,10 +61,8 @@ de:
     components:
       blogs:
         actions:
-          comment: Kommentieren
           create: Erstellen
           destroy: Löschen
-          endorse: Unterstützen
           update: Aktualisieren
         name: Blog
         settings:

data/config/locales/el.yml

@@ -1,11 +1,6 @@
+---
 el:
   activemodel:
-    attributes:
-      post:
-        body: Σώμα
-        decidim_author_id: Συντάκτης
-        published_at: Ώρα δημοσίευσης
-        title: Τίτλος
     models:
       decidim/blogs/create_post_event: Νέα ανάρτηση ιστολογίου
   activerecord:
@@ -16,14 +11,16 @@ el:
   decidim:
     blogs:
       actions:
+        author_id: Δημιουργία ανάρτησης ως
         confirm_destroy: Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν τη δημοσίευση;
         destroy: Διαγραφή
         edit: Επεξεργασία
         new: Νέα δημοσίευση
         title: Ενέργειες
-        user_group_id: Δημιουργία ανάρτησης ως
       admin:
         models:
+          components:
+            body: Σώμα
           post:
             name: Δημοσίευση
         posts:
@@ -51,7 +48,7 @@ el:
             author: Συντάκτης
             body: Σώμα
             created_at: Δημιουργήθηκε στις
-            title: Τίτλος
+            title: τίτλος
       posts:
         show:
           back: Επιστροφή στη λίστα
@@ -63,12 +60,6 @@ el:
       read_more: Διαβάστε περισσότερα
     components:
       blogs:
-        actions:
-          comment: Σχόλιο
-          create: Δημιουργία
-          destroy: Διαγραφή
-          endorse: Επιδοκιμασία
-          update: Ενημέρωση
         name: Ιστολόγιο
         settings:
           global: