alchemy_cms 7.1.5 → 7.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96768643fc124e7d3faf032a61ec6b1cb2d737a5582f146990a63809f5f12814
-  data.tar.gz: 8bc4f8f2d7c4416562ee1259601919f48867b91b4479130d24975c900ecc561b
+  metadata.gz: 8c18c4c0bf8d1eca13517eb239dd21c2995e35078d4bf652ac8ad6ad60fe0604
+  data.tar.gz: 0461d163fbeacc70b4949c82f363eaca684a380b0a6a97668bd0145c30248740
 SHA512:
-  metadata.gz: 2b79394f97b700fa5e59fa242c50d9b296b3de5abcd8e35d483a609fc7d44329ab0e5cdc9d350f8e2891fea81a2f5627fe1a2a08436d1fb3f56ef3e22d209f08
-  data.tar.gz: 5e018ef946f2185733751c6d2e4e62248ce2af578c2cefec7417932b1d8153522ec6f0c684451989291c6a1361a49193295e6c4ae1f3218fbe9c5398d76bb565
+  metadata.gz: 350a8d8456af8acf413ebd125b974f95edeecf5abe4b3cad1cd6ef9515f19d3371905b63074250dd2a2f7349b0c0aae679d71f7f81c2b661190acbc8ed8a66c8
+  data.tar.gz: a90eb673042a0b72f67f75dcd02dec0b95aaae850c6d45d250d3d6f0d8f03ce230cb081e05e95ced98ccf8c7d86fd278d3dca31117b9dc566e52f92c8144c1bb

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 7.1.7 (2024-04-12)
+
+- [7.1-stable] Fix Ingredient Boolean View [#2838](https://github.com/AlchemyCMS/alchemy_cms/pull/2838) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.1-stable] Nullify Ingredients::Page on Page destroy [#2831](https://github.com/AlchemyCMS/alchemy_cms/pull/2831) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.1] Reload preview window (again) after element create [#2826](https://github.com/AlchemyCMS/alchemy_cms/pull/2826) ([tvdeyen](https://github.com/tvdeyen))
+- [7.1-stable] Fix module error [#2822](https://github.com/AlchemyCMS/alchemy_cms/pull/2822) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.1-stable] Mark ingredient output as html_safe [#2782](https://github.com/AlchemyCMS/alchemy_cms/pull/2782) ([alchemycms-bot](https://github.com/alchemycms-bot))
+
+## 7.1.6 (2024-03-05)
+
+- [7.1-stable] Do not include timezone in datepickers only displaying date [#2768](https://github.com/AlchemyCMS/alchemy_cms/pull/2768) ([alchemycms-bot](https://github.com/alchemycms-bot))
+
 ## 7.1.5 (2024-02-29)
 
 - [7.1-stable] Fix taggable uniqueness in tags admin table [#2764](https://github.com/AlchemyCMS/alchemy_cms/pull/2764) ([alchemycms-bot](https://github.com/alchemycms-bot))

data/Gemfile

@@ -59,3 +59,5 @@ end
 gem "web-console", "~> 4.2", group: :development
 
 gem "rails_live_reload", "~> 0.3.5"
+
+gem "gem-release", "~> 2.2"

data/app/components/alchemy/ingredients/audio_view.rb

@@ -4,7 +4,7 @@ module Alchemy
       def call
         content_tag(:audio, **html_options) do
           tag(:source, src: src, type: type)
-        end
+        end.html_safe
       end
 
       def render?

data/app/components/alchemy/ingredients/base_view.rb

@@ -16,7 +16,7 @@ module Alchemy
       end
 
       def call
-        value
+        value.html_safe
       end
 
       def render?

data/app/components/alchemy/ingredients/boolean_view.rb

@@ -2,7 +2,7 @@ module Alchemy
   module Ingredients
     class BooleanView < BaseView
       def call
-        Alchemy.t(value, scope: "ingredient_values.boolean")
+        Alchemy.t(value.to_s, scope: "ingredient_values.boolean").html_safe
       end
 
       def render?

data/app/components/alchemy/ingredients/datetime_view.rb

@@ -15,7 +15,7 @@ module Alchemy
           ingredient.value.to_s(:rfc822)
         else
           ::I18n.l(ingredient.value, format: date_format)
-        end
+        end.html_safe
       end
     end
   end

data/app/components/alchemy/ingredients/file_view.rb

@@ -23,7 +23,7 @@ module Alchemy
             class: ingredient.css_class.presence,
             title: ingredient.title.presence
           }.merge(html_options)
-        )
+        ).html_safe
       end
 
       def render?

data/app/components/alchemy/ingredients/headline_view.rb

@@ -7,13 +7,22 @@ module Alchemy
       end
 
       def call
-        content_tag "h#{@level || ingredient.level}",
-          ingredient.value,
-          id: ingredient.dom_id.presence,
-          class: [
-            ingredient.size ? "h#{ingredient.size}" : nil,
-            html_options[:class]
-          ]
+        content_tag tag_name, id: dom_id, class: css_classes do
+          ingredient.value
+        end.html_safe
+      end
+
+      private
+
+      def tag_name = "h#{@level || ingredient.level}"
+
+      def dom_id = ingredient.dom_id.presence
+
+      def css_classes
+        [
+          ingredient.size ? "h#{ingredient.size}" : nil,
+          html_options[:class]
+        ]
       end
     end
   end

data/app/components/alchemy/ingredients/link_view.rb

@@ -12,7 +12,7 @@ module Alchemy
       end
 
       def call
-        link_to(link_text, value, {target: link_target}.merge(html_options))
+        link_to(link_text, value, {target: link_target}.merge(html_options)).html_safe
       end
 
       private

data/app/components/alchemy/ingredients/page_view.rb

@@ -4,7 +4,7 @@ module Alchemy
       delegate :page, to: :ingredient
 
       def call
-        link_to page.name, alchemy.show_page_path(urlname: page.urlname)
+        link_to(page.name, alchemy.show_page_path(urlname: page.urlname)).html_safe
       end
 
       def render?

data/app/components/alchemy/ingredients/picture_view.rb

@@ -57,7 +57,7 @@ module Alchemy
           content_tag(:figure, output, {class: ingredient.css_class.presence}.merge(html_options))
         else
           output
-        end
+        end.html_safe
       end
 
       private

data/app/components/alchemy/ingredients/richtext_view.rb

@@ -15,7 +15,7 @@ module Alchemy
           ingredient.stripped_body
         else
           value.to_s.html_safe
-        end
+        end.html_safe
       end
     end
   end

data/app/components/alchemy/ingredients/text_view.rb

@@ -24,7 +24,7 @@ module Alchemy
             target: ((link_target == "blank") ? "_blank" : nil),
             data: {link_target: link_target}
           }.merge(html_options))
-        end
+        end.html_safe
       end
 
       private

data/app/components/alchemy/ingredients/video_view.rb

@@ -6,7 +6,7 @@ module Alchemy
       def call
         content_tag(:video, html_options) do
           tag(:source, src: src, type: attachment.file_mime_type)
-        end
+        end.html_safe
       end
 
       def render?

data/app/javascript/alchemy_admin/components/datepicker.js

@@ -13,14 +13,25 @@ class Datepicker extends AlchemyHTMLElement {
   }
 
   afterRender() {
+    this.flatpickr = flatpickr(
+      this.getElementsByTagName("input")[0],
+      this.flatpickrOptions
+    )
+  }
+
+  disconnected() {
+    this.flatpickr.destroy()
+  }
+
+  get flatpickrOptions() {
+    const enableTime = /time/.test(this.inputType)
     const options = {
       // alchemy_i18n supports `zh_CN` etc., but flatpickr only has two-letter codes (`zh`)
       locale: currentLocale().slice(0, 2),
       altInput: true,
       altFormat: translate(`formats.${this.inputType}`),
       altInputClass: "flatpickr-input",
-      dateFormat: "Z",
-      enableTime: /time/.test(this.inputType),
+      enableTime,
       noCalendar: this.inputType === "time",
       time_24hr: translate("formats.time_24hr"),
       onValueUpdate(_selectedDates, _dateStr, instance) {
@@ -28,11 +39,11 @@ class Datepicker extends AlchemyHTMLElement {
       }
     }
 
-    this.flatpickr = flatpickr(this.getElementsByTagName("input")[0], options)
-  }
+    if (enableTime) {
+      options.dateFormat = "Z"
+    }
 
-  disconnected() {
-    this.flatpickr.destroy()
+    return options
   }
 }
 

data/app/models/alchemy/page.rb

@@ -121,6 +121,8 @@ module Alchemy
     has_one :draft_version, -> { drafts }, class_name: "Alchemy::PageVersion"
     has_one :public_version, -> { published }, class_name: "Alchemy::PageVersion", autosave: -> { persisted? }
 
+    has_many :page_ingredients, class_name: "Alchemy::Ingredients::Page", foreign_key: :related_object_id, dependent: :nullify
+
     before_validation :set_language,
       if: -> { language.nil? }
 

data/app/views/alchemy/admin/elements/create.js.erb

@@ -28,6 +28,7 @@
 
   Alchemy.growl('<%= Alchemy.t(:successfully_added_element) %>');
   Alchemy.closeCurrentDialog();
+  Alchemy.reloadPreview();
 
   el = document.querySelector('#element_<%= @element.id %>');
   el.focusElement();

data/lib/alchemy/modules.rb

@@ -35,7 +35,7 @@ module Alchemy
             defined_controllers.concat(definition_hash["navigation"]["sub_navigation"].map { |x| x["controller"] })
           end
 
-          validate_controllers_existence(defined_controllers)
+          validate_controllers_existence(defined_controllers, definition_hash)
         end
 
         @@alchemy_modules |= [definition_hash]
@@ -43,7 +43,7 @@ module Alchemy
 
       private
 
-      def validate_controllers_existence(controllers)
+      def validate_controllers_existence(controllers, definition_hash)
         controllers.each do |controller_val|
           next if controller_val.blank?
 

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "7.1.5"
+  VERSION = "7.1.7"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 7.1.5
+  version: 7.1.7
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-29 00:00:00.000000000 Z
+date: 2024-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer