alchemy_cms 7.4.5 → 7.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cf8a86e227213b067edafe887d14b0790eb1a0ec77d94791de2f035b638409e
-  data.tar.gz: 35ff4c4c0204fdef6aa184ae4fdb2dc2e044a35da404cdd7369c809705932857
+  metadata.gz: dac52b8382bc65dd200d1e8c0217e0a53b7e5774f2b074c6a3bc6716da242e41
+  data.tar.gz: ddbd1426fedc2282cb82b3ece15d1d6b1a9553c0da5b7f640b84198599c6eca9
 SHA512:
-  metadata.gz: 5920cb9a46fb4a13ce9a968c9f2347fe4dbea1b7331c4f6e7dfbde992e525c5e9cf093053422656d8685b1923acd28d4284a44cf29a5f5bec39e5afa370f1c59
-  data.tar.gz: 419af4444c3f5ccb167d05a61ca07f8a1286557674c21137637ead61bdd14c479ad0d91ab688e4802c09b4a531a60f3deabea5d3bfb42450ee93a8405728e66f
+  metadata.gz: 213cf6190790413cfd04f8e0b6fc9f8c45fe718d2474a5c2aa097cbb455986989491cf149ffcf8d2bad15e0d21fff2c2894d7eb3fedb5f5acab743e38d9c6d53
+  data.tar.gz: b6f588b2940581cd18a33bc1e126d8b128f5ce78c403ec79db66e320605df8088fa84d856efe6e84912d3909e40fed4d7ea5764b68f99c304c04e173fb00ab99

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 7.4.6 (2025-27-06)
+
+- [7.4-stable] Fix multi language picture descriptions [#3293](https://github.com/AlchemyCMS/alchemy_cms/pull/3293) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.4-stable] Add server error turbo_stream template [#3292](https://github.com/AlchemyCMS/alchemy_cms/pull/3292) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.4-stable] Remove non visual custom elements after connect [#3291](https://github.com/AlchemyCMS/alchemy_cms/pull/3291) ([alchemycms-bot](https://github.com/alchemycms-bot))
+
 ## 7.4.5 (2025-06-04)
 
 - [7.4] Fix attachment overlay list overflow [#3261](https://github.com/AlchemyCMS/alchemy_cms/pull/3261) ([tvdeyen](https://github.com/tvdeyen))

data/app/controllers/alchemy/admin/picture_descriptions_controller.rb

@@ -1,8 +1,12 @@
 module Alchemy
   module Admin
     class PictureDescriptionsController < Alchemy::Admin::ResourcesController
+      include PictureDescriptionsFormHelper
+
       def edit
-        @picture_description = @picture.descriptions.find_or_initialize_by(language_id: params[:language_id])
+        @picture_description = @picture.descriptions.find_or_initialize_by(
+          language_id: params[:language_id]
+        )
       end
 
       private

data/app/controllers/alchemy/admin/pictures_controller.rb

@@ -6,6 +6,7 @@ module Alchemy
       include UploaderResponses
       include ArchiveOverlay
       include CurrentLanguage
+      include PictureDescriptionsFormHelper
 
       helper "alchemy/admin/tags"
 

data/app/controllers/concerns/alchemy/admin/picture_descriptions_form_helper.rb

@@ -0,0 +1,16 @@
+module Alchemy
+  module Admin
+    module PictureDescriptionsFormHelper
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :description_field_name_prefix
+      end
+
+      def description_field_name_prefix
+        picture_description_counter = @picture.descriptions.index(@picture_description)
+        "picture[descriptions_attributes][#{picture_description_counter}]"
+      end
+    end
+  end
+end

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

@@ -25,6 +25,8 @@ class Action extends HTMLElement {
     } else {
       console.error(`Unknown Alchemy action: ${this.name}`)
     }
+
+    this.remove()
   }
 
   get name() {

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

@@ -3,6 +3,7 @@ import { growl } from "alchemy_admin/growler"
 class Growl extends HTMLElement {
   connectedCallback() {
     growl(this.message, this.getAttribute("type") || "notice")
+    this.remove()
   }
 
   get message() {

data/app/views/alchemy/admin/picture_descriptions/_form.html.erb

@@ -1,11 +1,9 @@
-<% field_name_prefix = "picture[descriptions_attributes][#{picture_description_counter}]" %>
-
 <% if picture_description.persisted? %>
-  <%= hidden_field field_name_prefix, :id, value: picture_description.id %>
+  <%= hidden_field description_field_name_prefix, :id, value: picture_description.id %>
 <% else %>
-  <%= hidden_field field_name_prefix, :language_id, value: picture_description.language_id %>
-  <%= hidden_field field_name_prefix, :picture_id, value: picture_description.picture_id %>
+  <%= hidden_field description_field_name_prefix, :language_id, value: picture_description.language_id %>
+  <%= hidden_field description_field_name_prefix, :picture_id, value: picture_description.picture_id %>
 <% end %>
 
-<%= label field_name_prefix, :text, Alchemy::PictureDescription.human_attribute_name(:text), class: "control-label" %>
-<%= text_area field_name_prefix, :text, value: picture_description.text, rows: 3 %>
+<%= label description_field_name_prefix, :text, Alchemy::PictureDescription.human_attribute_name(:text), class: "control-label" %>
+<%= text_area description_field_name_prefix, :text, value: picture_description.text, rows: 5 %>

data/app/views/alchemy/admin/picture_descriptions/edit.html.erb

@@ -1,6 +1,6 @@
 <turbo-frame id="picture_descriptions">
   <%= render "form", {
-    picture_description: @picture_description,
-    picture_description_counter: @picture.descriptions.index(@picture_description)
+    description_field_name_prefix: description_field_name_prefix,
+    picture_description: @picture_description
   } %>
 </turbo-frame>

data/app/views/alchemy/admin/pictures/_form.html.erb

@@ -1,7 +1,7 @@
 <%= turbo_frame_tag(@picture) do %>
-  <%= alchemy_form_for [:admin, @picture] do |f| %>
+  <%= alchemy_form_for [alchemy, :admin, @picture] do |f| %>
     <%= f.input :name %>
-    <%= render "picture_description_field", f: f %>
+    <%= render "alchemy/admin/pictures/picture_description_field", f: f %>
     <%= render Alchemy::Admin::TagsAutocomplete.new(additional_class: "input") do %>
       <%= f.label :tag_list %>
       <%= f.text_field :tag_list, value: f.object.tag_list.join(",") %>

data/app/views/alchemy/admin/pictures/_picture_description_field.html.erb

@@ -2,30 +2,38 @@
   <% if Alchemy::Language.published.many? %>
     <label class="inline-label" style="float: right">
       <%= Alchemy::Language.model_name.human %>
-      <%= select_tag :language_id, options_from_collection_for_select(
+      <%= select description_field_name_prefix, :language_id, options_from_collection_for_select(
           Alchemy::Language.published, :id, ->(l) { l.code.upcase },
           selected: @picture_description.language_id,
-        ), data: {
-          url: alchemy.edit_admin_picture_description_url(id: "__ID__", picture_id: @picture)
+        ),
+        {},
+        id: "picture_description_select",
+        data: {
+          url: alchemy.edit_admin_picture_description_url(
+            id: @picture_description.id || "__ID__",
+            picture_id: @picture
+          )
         } %>
     </label>
   <% end %>
 
   <turbo-frame id="picture_descriptions">
     <%= render "alchemy/admin/picture_descriptions/form",
-      picture_description_counter: @picture.descriptions.index(@picture_description),
+      description_field_name_prefix: description_field_name_prefix,
       picture_description: @picture_description %>
   </turbo-frame>
 </div>
 
-<script type="module">
-  const select = document.querySelector("#language_id")
+<script>
+  (function ($) {
+    const select = $.getElementById("picture_description_select")
 
-  if (select) {
-    select.addEventListener("change", () => {
-      const url = new URL(select.dataset.url)
-      url.searchParams.set("language_id", select.value)
-      Turbo.visit(url, { frame: "picture_descriptions" })
-    })
-  }
+    if (select) {
+      select.addEventListener("change", () => {
+        const url = new URL(select.dataset.url)
+        url.searchParams.set("language_id", select.value)
+        Turbo.visit(url, { frame: "picture_descriptions" })
+      })
+    }
+  })(document)
 </script>

data/app/views/alchemy/base/500.turbo_stream.erb

@@ -0,0 +1,3 @@
+<alchemy-growl type="error">
+  <%= @notice %>
+</alchemy-growl>

data/db/migrate/20250626160259_add_unique_index_to_picture_descriptions.rb

@@ -0,0 +1,7 @@
+class AddUniqueIndexToPictureDescriptions < ActiveRecord::Migration[7.0]
+  def change
+    add_index :alchemy_picture_descriptions, [:picture_id, :language_id],
+      name: "alchemy_picture_descriptions_on_picture_id_and_language_id",
+      unique: true
+  end
+end

data/lib/alchemy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 7.4.5
+  version: 7.4.6
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -801,6 +801,7 @@ files:
 - app/controllers/concerns/alchemy/admin/archive_overlay.rb
 - app/controllers/concerns/alchemy/admin/crop_action.rb
 - app/controllers/concerns/alchemy/admin/current_language.rb
+- app/controllers/concerns/alchemy/admin/picture_descriptions_form_helper.rb
 - app/controllers/concerns/alchemy/admin/uploader_responses.rb
 - app/controllers/concerns/alchemy/legacy_page_redirects.rb
 - app/controllers/concerns/alchemy/site_redirects.rb
@@ -1135,6 +1136,7 @@ files:
 - app/views/alchemy/attachments/show.html.erb
 - app/views/alchemy/base/403.html.erb
 - app/views/alchemy/base/500.html.erb
+- app/views/alchemy/base/500.turbo_stream.erb
 - app/views/alchemy/base/error_notice.html.erb
 - app/views/alchemy/base/error_notice.js.erb
 - app/views/alchemy/base/permission_denied.js.erb
@@ -1223,6 +1225,7 @@ files:
 - db/migrate/20230505132743_add_indexes_to_alchemy_pictures.rb
 - db/migrate/20231113104432_create_page_mutexes.rb
 - db/migrate/20240314105244_create_alchemy_picture_descriptions.rb
+- db/migrate/20250626160259_add_unique_index_to_picture_descriptions.rb
 - eslint.config.js
 - lib/alchemy.rb
 - lib/alchemy/ability_helper.rb