decidim-plans 0.16.5 → 0.16.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08d56d238a66eca983dbe996717bb9387525e974336ce65ab9f8943e1e3afe5e'
-  data.tar.gz: fe1204b85350bdea566562b75956c7eed3e989b793669b35b25be08b85cabe07
+  metadata.gz: 870133d81fb0fd7608a2087fbf2fdb7a434a37ebe3437334c9cdb604c2afd3f8
+  data.tar.gz: 4e28e6926fbdfe8339eb19ef66c1c455cef50ad9cf42a1940f2c2ec9df0a041f
 SHA512:
-  metadata.gz: f8ac917fa65cc0f67ae41541ee8d9af242ecff01ed3b3936bba4f1dfe3b6de3d771dc830a6b9522596ab57a73d378b0ffe2be76454e9b96f530a3eb947144ed4
-  data.tar.gz: 17df9cff118e3dc9be17afb6408a247e600da2018cef3220078bf5885a0ebbc3da04780e14fe074935e4cbfc4966f379f4e37a6c035b65986002b1e5a4428a1a
+  metadata.gz: 1cd3865a386f58d321ff9e077e7c8728b011dfe85cffcc52b0c6854759ee91592398eab98506fdb31d162f52022a532a0bc5e18d21191e88798d9fa29fc84858
+  data.tar.gz: 55e53122d62b560a70532c9ce0d3b2b8466b4ca2187cc54664df4f3710a8697b8f5112c200d597d39e19006271ae4402d6421d5a8dac83e8b5dd254201bfb56f

data/app/commands/decidim/plans/admin/export_plans_to_budgets.rb

@@ -6,7 +6,7 @@ module Decidim
       # A command with all the business logic when an admin exports plans to a
       # single budget component.
       class ExportPlansToBudgets < Rectify::Command
-        include ActionView::Helpers::TextHelper
+        include Decidim::Plans::RichPresenter
 
         # Public: Initializes the command.
         #
@@ -85,13 +85,14 @@ module Decidim
           original_plan.sections.each do |section|
             content = original_plan.contents.find_by(section: section)
             content.body.each do |locale, body_text|
-              title = sanitize(section.body[locale])
+              title = plain_content(section.body[locale])
               pr_desc[locale] ||= ""
               pr_desc[locale] += "<h3>#{title}</h3>\n"
 
               # Wrap non-HTML strings within a <p> tag and replace newlines with
-              # <br>. This also takes care of sanitization.
-              pr_desc[locale] += simple_format(body_text)
+              # <br>. This also takes care of sanitization and specific styling
+              # of the text, such as bold, italics, etc.
+              pr_desc[locale] += rich_content(body_text)
             end
           end
 
@@ -103,7 +104,7 @@ module Decidim
 
         def sanitize_localized(hash)
           hash.each do |locale, value|
-            hash[locale] = sanitize(value)
+            hash[locale] = plain_content(value)
           end
         end
       end

data/app/controllers/decidim/plans/plans_controller.rb

@@ -17,9 +17,9 @@ module Decidim
 
       helper_method :attached_proposals_picker_field
 
-      before_action :authenticate_user!, only: [:new, :create, :edit, :update, :withdraw, :preview, :publish, :close, :reopen, :destroy]
+      before_action :authenticate_user!, only: [:new, :create, :edit, :update, :withdraw, :preview, :publish, :close, :destroy]
       before_action :check_draft, only: [:new]
-      before_action :retrieve_plan, only: [:show, :edit, :update, :withdraw, :preview, :publish, :close, :reopen, :destroy]
+      before_action :retrieve_plan, only: [:show, :edit, :update, :withdraw, :preview, :publish, :close, :destroy]
       before_action :ensure_published!, only: [:show, :withdraw]
 
       def index

data/app/helpers/decidim/plans/links_helper.rb

@@ -4,7 +4,7 @@ module Decidim
   module Plans
     module LinksHelper
       # This is for generating the links so that they maintain the search status
-      def request_params(extra_params={}, exclude_params=[])
+      def request_params(extra_params = {}, exclude_params = [])
         @request_params ||= request.params.except(
           *(exclude_params + [
             :action,
@@ -17,7 +17,7 @@ module Decidim
         ).merge(prepare_extra_params(extra_params))
       end
 
-      def request_params_query(extra_params={}, exclude_params=[])
+      def request_params_query(extra_params = {}, exclude_params = [])
         return "" unless request_params(extra_params, exclude_params).any?
 
         "?#{request_params.to_query}"

data/app/presenters/concerns/decidim/plans/rich_presenter.rb

@@ -6,8 +6,18 @@ module Decidim
       extend ActiveSupport::Concern
       include ActionView::Helpers::TextHelper
 
+      def plain_content(content)
+        sanitize(content, tags: [])
+      end
+
       def rich_content(content)
-        simple_format(content, wrapper_tag: nil)
+        simple_format(sanitize(content, tags: allowed_rich_tags), wrapper_tag: nil)
+      end
+
+      protected
+
+      def allowed_rich_tags
+        %w(strong em b i)
       end
     end
   end

data/app/presenters/decidim/plans/content_presenter.rb

@@ -15,7 +15,7 @@ module Decidim
       end
 
       def title
-        sanitize(translated_attribute(content.title))
+        plain_content(translated_attribute(content.title))
       end
 
       def body

data/app/presenters/decidim/plans/plan_presenter.rb

@@ -29,7 +29,7 @@ module Decidim
       end
 
       def title
-        sanitize(translated_attribute(plan.title))
+        plain_content(translated_attribute(plan.title))
       end
 
       def body
@@ -37,8 +37,8 @@ module Decidim
           content = plan.contents.find_by(section: section)
           next if content.nil?
 
-          section_title = sanitize(translated_attribute(content.title))
-          section_body = sanitize(translated_attribute(content.body))
+          section_title = plain_content(translated_attribute(content.title))
+          section_body = plain_content(translated_attribute(content.body))
           "<dt>#{section_title}</dt> <dd>#{section_body}</dd>"
         end
 

data/lib/decidim/plans/version.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Plans
-    VERSION = "0.16.5"
+    VERSION = "0.16.6"
     DECIDIM_VERSION = "~> 0.16.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-plans
 version: !ruby/object:Gem::Version
-  version: 0.16.5
+  version: 0.16.6
 platform: ruby
 authors:
 - Antti Hukkanen