alchemy_cms 7.0.10 → 7.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03740f526e8baf73a62015e776b187264ab994a64237343fae75cd2f9f48eade
-  data.tar.gz: 5e8acf12fa9aaccc71f62964f75138d2c759d8e4f927a8e090d63e289c583f17
+  metadata.gz: 82cd64dd71fa79871bc3bfbec5f7f13d3a12d8227fe2294c4ba2fe544ad98dcb
+  data.tar.gz: a30831a00b1afa326159f19d706352ddf43f0e0f4cb84e0fa7a2590b7e12435a
 SHA512:
-  metadata.gz: ff2dacd727ac7cb03618af13a2b7fe518ac38eba5b0dc39c551410f1510347e5056a784294a80ec38d4334fc65c6c97d4cf0cda43b42fbddb64b8907eaa664f8
-  data.tar.gz: 98beefe383887b24cdf7c2dd07544bba39e073f2e7a61163f3c59f41041f7502c73464a0a2392e84bb35e7ef125e66a75e2bd166cfc64308596e26e65f085a95
+  metadata.gz: 200987b061160915c554f377a735d6a590bc7d342bd7ebae9d133c0812440a731b1e9aa2b3566a6e241a32282fb19b6b4b1ff94fbf57261f1ae99f16060d0b91
+  data.tar.gz: 6dbe3f6fbf7cff9946245c405a5b5caa884872f7095d3da3b49a05bb500eb7c7a626bfe8968b9e7ab894f7e2db6d077eac87876f8ccc927d885a4d87d422e820

data/.gem_release.yml

@@ -0,0 +1,9 @@
+bump:
+  file: lib/alchemy/version.rb
+  remote: upstream
+  version: patch
+tag:
+  remote: upstream
+release:
+  github: true
+  repo: AlchemyCMS/alchemy_cms

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 7.0.12 (2024-04-12)
+
+- [7.0-stable] Fix Ingredient Boolean View [#2837](https://github.com/AlchemyCMS/alchemy_cms/pull/2837) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.0-stable] Nullify Ingredients::Page on Page destroy [#2830](https://github.com/AlchemyCMS/alchemy_cms/pull/2830) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.0-stable] Fix module error [#2821](https://github.com/AlchemyCMS/alchemy_cms/pull/2821) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.0-stable] Mark ingredient output as html_safe [#2781](https://github.com/AlchemyCMS/alchemy_cms/pull/2781) ([alchemycms-bot](https://github.com/alchemycms-bot))
+
+## 7.0.11 (2024-03-05)
+
+- [7.0-stable] Do not include timezone in datepickers only displaying date [#2769](https://github.com/AlchemyCMS/alchemy_cms/pull/2769) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 7.0.10 (2024-02-29)
 
 - [7.0-stable] Fix taggable uniqueness in tags admin table [#2763](https://github.com/AlchemyCMS/alchemy_cms/pull/2763) ([alchemycms-bot](https://github.com/alchemycms-bot))

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/datepicker.js

@@ -12,6 +12,8 @@ export default function Datepicker(scope = document) {
   // Initializes the datepickers
   datepickerInputs.forEach((input) => {
     const type = input.dataset.datepickerType
+    const enableTime = /time/.test(type)
+
     const options = {
       // alchemy_i18n supports `zh_CN` etc., but flatpickr only has two-letter codes (`zh`)
       locale: Alchemy.locale.slice(0, 2),
@@ -19,7 +21,7 @@ export default function Datepicker(scope = document) {
       altFormat: Alchemy.t(`formats.${type}`),
       altInputClass: "flatpickr-input",
       dateFormat: "Z",
-      enableTime: /time/.test(type),
+      enableTime,
       noCalendar: type === "time",
       time_24hr: Alchemy.t("formats.time_24hr"),
       onValueUpdate(_selectedDates, _dateStr, instance) {
@@ -28,6 +30,11 @@ export default function Datepicker(scope = document) {
         )
       }
     }
+
+    if (enableTime) {
+      options.dateFormat = "Z"
+    }
+
     flatpickr(input, 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/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.0.10"
+  VERSION = "7.0.12"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 7.0.10
+  version: 7.0.12
 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
@@ -712,6 +712,7 @@ extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
 - ".editorconfig"
+- ".gem_release.yml"
 - ".github/FUNDING.yml"
 - ".github/ISSUE_TEMPLATE/Bug_report.md"
 - ".github/ISSUE_TEMPLATE/Feature_request.md"