promethee 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e202e7ffd817f5a07854497c59ade42067f7e3ad1a44fb3d55e7a8f5b89f221
-  data.tar.gz: 84f0d2f18ab92b60a294131826607817bfba7175e445dd17517cf2102db6914a
+  metadata.gz: 830a5df82ba3d7061fbb76916d8ebf5775c0d930c42ab1fb9b7a767276709e32
+  data.tar.gz: 73587510af2189dd522402903a7e6168fdd8c79c165e0ddb04cf1419cb725483
 SHA512:
-  metadata.gz: 71138249e1f16f4d9bafc0b097db1349e6dc3d193f42001775afb2c6beccd87a19b0862f3b4e453189a1066f13b8c3783e603220b9c1a48de990cd15b38fdc66
-  data.tar.gz: 0c1019c2ca28bae6f8f667d740fc372e76f6f0c9da8c74cb0af89b3fced4c3bed39dbab8fe73ec604c4f2be60cd26739c47cbda393c6a71e600e83ad5ac1a032
+  metadata.gz: 3f20fce51ba8489ce01f449c04381566df8a82d724192acf061d2fb43c66fd0b10fc3cd1da69545babdca27ec4df5b164295f7fb371d6237975f11433e9b2512
+  data.tar.gz: a40324a77abf49e3a66ec40f63d375ace44b002ca1ce1819f945a1445bb829b6f891a40d4cd21d502a8f16e2414f5a45f39b7dceba1e2cf9dfa8f043dba891c3

data/app/models/concerns/promethee_data.rb

@@ -11,7 +11,7 @@ module PrometheeData
   def promethee_data_page_title
     data['attributes']['searchable_title']
   rescue
-    ""
+    ''
   end
 
   def promethee_data_page_title=(value)
@@ -21,7 +21,7 @@ module PrometheeData
   def promethee_data_page_description
     data['attributes']['searchable_description']
   rescue
-    ""
+    ''
   end
 
   def promethee_data_page_description=(value)
@@ -32,13 +32,13 @@ module PrometheeData
   def promethee_data_translation_title
     data['components'].first['attributes']['searchable_title']
   rescue
-    ""
+    ''
   end
 
   def promethee_data_translation_description
     data['components'].first['attributes']['searchable_description']
   rescue
-    ""
+    ''
   end
 
 
@@ -52,19 +52,30 @@ module PrometheeData
   def promethee_extract_searchable(component)
     return '' if component.blank?
     searchable = ' '
-    component['attributes'].each do |key, value|
+    searchable += promethee_extract_searchable_attributes component['attributes'] if component.include?('attributes')
+    # For masters, contents are in children
+    searchable += promethee_extract_searchable_children component['children'] if component.include? 'children'
+    # For translations, contents are in components, not children
+    searchable += promethee_extract_searchable_children component['components'] if component.include? 'components'
+    searchable
+  end
+
+  def promethee_extract_searchable_attributes(attributes)
+    searchable = ' '
+    attributes.each do |key, value|
       if key.starts_with? 'searchable_'
         clean_value = strip_tags value
         searchable += "#{clean_value} "
       end
-    end if component.include? 'attributes'
-    component['children'].each do |child|
-      searchable += promethee_extract_searchable child
-    end if component.include? 'children'
-    # for translations
-    component['components'].each do |child|
+    end
+    searchable
+  end
+
+  def promethee_extract_searchable_children(components)
+    searchable = ' '
+    components.each do |child|
       searchable += promethee_extract_searchable child
-    end if component.include? 'components'
+    end
     searchable
   end
 end

data/app/views/promethee/components/collection_item/_edit.move.html.erb

@@ -13,7 +13,7 @@
         </div>
       </div>
       <div class="row">
-        <div class="col-xs-12 collection-item-caption" ng-show="component.attributes.searchable_caption !== ''">Caption</div>
+        <div class="col-xs-12 collection-item-caption" ng-show="component.attributes.searchable_caption" ng-bind-html="component.attributes.searchable_caption | htmlSafe"></div>
       </div>
     </div>
   </div>
@@ -43,4 +43,4 @@
       }
     })
   }]);
-</script>
+</script>

data/app/views/promethee/components/faq_item/_localize.html.erb

@@ -16,7 +16,7 @@
     <div class="row">
       <div class="col-md-6">
         <b>Body</b>
-        <p>{{master.attributes.searchable_body}}</p>
+        <div ng-bind-html="master.attributes.searchable_body | htmlSafe"></div>
       </div>
       <div class="col-md-6">
         <div class="form-group">

data/lib/promethee/data/master_localized.rb

@@ -11,26 +11,22 @@ class Promethee::Data::MasterLocalized < Promethee::Data
   protected
 
   def localize_component(component)
-    localize_component_attributes component
-    localize_component_children component
+    localize_component_attributes component if component.include?(:attributes)
+    localize_component_children component if component.include?(:children)
   end
 
   def localize_component_attributes(component)
-    return unless component.include? :attributes
     localized_component = find_localized_component component[:id]
-    return unless localized_component
-    return unless localized_component.include? :attributes
+    return if (localized_component.nil? || !localized_component.include?(:attributes))
     component[:attributes].merge! localized_component[:attributes]
   end
 
   def localize_component_children(component)
-    return unless component.include? :children
     component[:children].each { |child| localize_component child }
   end
 
   def find_localized_component(id)
-    return if @localization.nil?
-    return unless @localization.include? :components
+    return if @localization.nil? || !@localization.include?(:components)
     @localization[:components].find { |component| component[:id] == id }
   end
 end

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '1.7.1'
+    VERSION = '1.7.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Sébastien Gaya
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails