Merge pull request #3349 from AlchemyCMS/backport/7.3-stable/pr-3348

[7.3-stable] fix(DatetimeView): Use settings value if present

Author: tvdeyen

Gemfile

@@ -15,7 +15,7 @@ if ENV["DB"] == "mysql" || ENV["DB"] == "mariadb"
 end
 gem "pg", "~> 1.0" if ENV["DB"] == "postgresql"
 
-gem "alchemy_i18n", git: "https://github.com/AlchemyCMS/alchemy_i18n.git", branch: "main"
+gem "alchemy_i18n", git: "https://github.com/AlchemyCMS/alchemy_i18n.git", branch: "4.2-stable"
 
 group :development, :test do
   gem "execjs", "~> 2.9.1"

app/components/alchemy/ingredients/datetime_view.rb

@@ -1,13 +1,15 @@
 module Alchemy
   module Ingredients
     class DatetimeView < BaseView
+      DEFAULT_DATE_FORMAT = :"alchemy.default"
+
       attr_reader :date_format
 
       # @param ingredient [Alchemy::Ingredient]
       # @param date_format [String] The date format to use. Use either a strftime format string, a I18n format symbol or "rfc822". Defaults to "time.formats.alchemy.default".
-      def initialize(ingredient, date_format: :"alchemy.default", html_options: {})
+      def initialize(ingredient, date_format: nil, html_options: {})
         super(ingredient)
-        @date_format = settings_value(:date_format, value: date_format)
+        @date_format = settings_value(:date_format, value: date_format) || DEFAULT_DATE_FORMAT
       end
 
       def call

app/models/alchemy/ingredients/headline.rb

@@ -42,7 +42,7 @@ def size_options
       private
 
       def levels
-        settings.fetch(:levels, (1..6))
+        settings.fetch(:levels, 1..6)
       end
 
       def sizes

spec/views/alchemy/ingredients/datetime_view_spec.rb

@@ -16,20 +16,43 @@
 
   let(:options) { {} }
 
+  subject do
+    render ingredient, options: options
+    rendered
+  end
+
   context "with date value" do
     context "without date_format passed" do
       it "translates the date value with default format" do
-        render ingredient, options: options
-        expect(rendered).to have_content("08.29.2024 12:00")
+        is_expected.to have_content("08.29.2024 12:00")
+      end
+    end
+
+    context "with date_format in settings" do
+      before do
+        allow(ingredient).to receive(:settings) do
+          {date_format: "%d.%m."}
+        end
+      end
+
+      it "translates the date value with format from settings" do
+        is_expected.to have_content("29.08.")
+      end
+
+      context "but with format passed as argument" do
+        let(:options) { {date_format: "%d.%m.%Y"} }
+
+        it "translates the date value with format from arguments" do
+          is_expected.to have_content("29.08.2024")
+        end
       end
     end
 
     context "with option date_format set to rfc822" do
       let(:options) { {date_format: "rfc822"} }
 
       it "renders the date rfc822 conform" do
-        render ingredient, options: options
-        expect(rendered).to have_content("Thu, 29 Aug 2024 12:00:00 +0200")
+        is_expected.to have_content("Thu, 29 Aug 2024 12:00:00 +0200")
       end
     end
   end
@@ -38,8 +61,7 @@
     let(:ingredient) { Alchemy::Ingredients::Datetime.new(value: nil) }
 
     it "renders nothing" do
-      render ingredient, options: options
-      expect(rendered).to eq("")
+      is_expected.to eq("")
     end
   end
 end