From a68098eaedc6aab63751b33cb38ad05bcbf26130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?=
 <senenrodero@gmail.com>
Date: Fri, 4 Jan 2019 14:03:49 +0100
Subject: [PATCH] Fix sanitization for translatable description attribute

Move method from sanitizable to globalizable concern because
globalize_accessors were overiding sanitizable method and was never
called. Another solution to this could be to load sanitizable
always after globalizable concern.

Old method implementation was not working well with globalize_accessors,
it was returning nil always.
---
 app/models/concerns/globalizable.rb | 4 ++++
 app/models/concerns/sanitizable.rb  | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/concerns/globalizable.rb b/app/models/concerns/globalizable.rb
index 2e8d3b935..f963787c7 100644
--- a/app/models/concerns/globalizable.rb
+++ b/app/models/concerns/globalizable.rb
@@ -12,6 +12,10 @@ module Globalizable
     def assign_model_to_translations
       translations.each { |translation| translation.globalized_model = self }
     end
+
+    def description
+      self.read_attribute(:description).try :html_safe
+    end
   end
 
   class_methods do
diff --git a/app/models/concerns/sanitizable.rb b/app/models/concerns/sanitizable.rb
index 055859c8b..4e3251fc1 100644
--- a/app/models/concerns/sanitizable.rb
+++ b/app/models/concerns/sanitizable.rb
@@ -6,10 +6,6 @@ module Sanitizable
     before_validation :sanitize_tag_list
   end
 
-  def description
-    super.try :html_safe
-  end
-
   protected
 
     def sanitize_description