alchemy_cms 7.1.3 → 7.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63a8036fd5b9c389fabfe14c5df6536ed7855e0718bb8163a61140bbf83673fc
-  data.tar.gz: 3921217db9ef5fcd38376239462db3d782de236cc360a15cf4539152346f70fd
+  metadata.gz: a6c615cf9ac7a5ea2ca6d9a146cf61aab6511bcfa4277740e8989492288427e9
+  data.tar.gz: 3a35e7708046a45c5abdc50403428c9fe153e95634a97a3ee6dc3552b3401030
 SHA512:
-  metadata.gz: 8f9198b7c07c9e961f39692f09e69b9534f9a5670e201590cc921588cc170a427091d12715f92626d1084dad5918d208e69872e3912bcb705b4784ee3724d34b
-  data.tar.gz: 5574bfca4fa4472e32920d22fab485399492ac7c5b19922c18bb5826ef872375cc10069a7dc1d443af9b91dcc358856c26c13ae5c9383a7e843cabc0c978dd4b
+  metadata.gz: 78fedab87a5984f88f012177c31133570647b7c7816a55ded8f56127fdf54070b6d6367db843214af1d38e45099502e309be950ceeb14bc78580158e5958ef21
+  data.tar.gz: 1d251b4a5ba8c0e0287d314d7c06a343ba83bf068b1afb243b026fa9dae254477c73639b4c5c67f7e96e820124255dd08d0eedb11eff127b1d53553e40e8d77e

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 7.1.4 (2024-02-27)
+
+- [7.1-stable] Merge pull request #2752 from tvdeyen/fix-copy-elements-order [#2754](https://github.com/AlchemyCMS/alchemy_cms/pull/2754) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.1-stable] Merge pull request #2750 from tvdeyen/fix-sortable-elements [#2751](https://github.com/AlchemyCMS/alchemy_cms/pull/2751) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.1-stable] Merge pull request #2689 from robinboening/fix_switching_to_default_language [#2746](https://github.com/AlchemyCMS/alchemy_cms/pull/2746) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.1-stable] Merge pull request #2741 from tvdeyen/fix-svg-thumbnail-size [#2743](https://github.com/AlchemyCMS/alchemy_cms/pull/2743) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.1-stable] Merge pull request #2735 from tvdeyen/fix-tags [#2736](https://github.com/AlchemyCMS/alchemy_cms/pull/2736) ([alchemycms-bot](https://github.com/alchemycms-bot))
+
 ## 7.1.3 (2024-02-19)
 
 - Update tinymce to version 6.8.3 [#2727](https://github.com/AlchemyCMS/alchemy_cms/pull/2727) ([depfu](https://github.com/apps/depfu))

data/app/assets/stylesheets/alchemy/archive.scss

@@ -74,7 +74,7 @@
       background: $thumbnail-background;
     }
 
-    &[src$=".svg"]:not([src*="alchemy/missing-image"]) {
+    &[src*=".svg"]:not([src*="alchemy/missing-image"]) {
       width: var(--picture-width);
       max-height: var(--picture-height);
     }

data/app/assets/stylesheets/alchemy/labels.scss

@@ -1,6 +1,3 @@
 .label {
-  @include label-base(
-    $margin: $default-margin/2 0,
-    $padding: $default-padding 2*$default-padding $default-padding
-  );
+  @include label-base($margin: 0, $padding: 0 2 * $default-padding);
 }

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

@@ -38,7 +38,8 @@ module Alchemy
       end
 
       def switch
-        set_alchemy_language(params[:language_id])
+        @language = set_alchemy_language(params[:language_id])
+        session[:alchemy_language_id] = @language.id
         do_redirect_to request.referer || alchemy.admin_dashboard_path
       end
 

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

@@ -12,7 +12,11 @@ module Alchemy
       private
 
       def load_current_language
-        @current_language = Alchemy::Language.current
+        @current_language = if session[:alchemy_language_id].present?
+          set_alchemy_language(session[:alchemy_language_id])
+        else
+          Alchemy::Language.current
+        end
         if @current_language.nil?
           flash[:warning] = Alchemy.t("Please create a language first.")
           redirect_to admin_languages_path

data/app/javascript/alchemy_admin/sortable_elements.js

@@ -29,12 +29,17 @@ function onSort(event) {
     params.parent_element_id = parentElement.dataset.elementId
   }
 
-  post(Alchemy.routes.order_admin_elements_path, params).then((response) => {
-    const data = response.data
-    Alchemy.growl(data.message)
-    Alchemy.PreviewWindow.refresh()
-    item.updateTitle(data.preview_text)
-  })
+  // Only send the request if the item was moved to a different container
+  // or sorted in the same list. Not on the old list in order to avoid incrementing
+  // the position of the other elements.
+  if (event.target === event.to) {
+    post(Alchemy.routes.order_admin_elements_path, params).then((response) => {
+      const data = response.data
+      Alchemy.growl(data.message)
+      Alchemy.PreviewWindow.refresh()
+      item.updateTitle(data.preview_text)
+    })
+  }
 }
 
 function onEnd() {

data/app/models/alchemy/page/page_elements.rb

@@ -37,11 +37,20 @@ module Alchemy
         #
         def copy_elements(source, target)
           repository = source.draft_version.element_repository
+          elements = repository.not_nested
+          page_version = target.draft_version
+          duplicate_elements(elements.unfixed, repository, page_version) +
+            duplicate_elements(elements.fixed, repository, page_version)
+        end
+
+        private
+
+        def duplicate_elements(elements, repository, page_version)
           transaction do
             Element.acts_as_list_no_update do
-              repository.not_nested.each.with_index(1) do |element, position|
+              elements.each.with_index(1) do |element, position|
                 Alchemy::DuplicateElement.new(element, repository: repository).call(
-                  page_version_id: target.draft_version.id,
+                  page_version_id: page_version.id,
                   position: position
                 )
               end

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

@@ -24,9 +24,7 @@
   $element_area.append(element_html);
 <%- end -%>
 
-<% if @element.fixed? %>
-  Alchemy.SortableElements('[name="fixed-element-<%= @element.id %>"] .nested-elements');
-<% end %>
+  Alchemy.SortableElements('[data-element-id="<%= @element.id %>"] .nested-elements');
 
   Alchemy.growl('<%= Alchemy.t(:successfully_added_element) %>');
   Alchemy.closeCurrentDialog();

data/app/views/alchemy/admin/tags/_tag.html.erb

@@ -2,7 +2,11 @@
   <td class="icon"><%= render_icon(:tag, size: "xl") %></td>
   <td class="name"><%= tag.name %></td>
   <td>
-    <%= tag.taggings.collect(&:taggable).collect { |t| t.class.model_name.human }.uniq.join(', ') %>
+    <% tag.taggings.collect(&:taggable).compact.uniq.each do |taggable| %>
+      <span class="label">
+        <%= taggable.class.model_name.human %>
+      </span>
+    <% end %>
   </td>
   <td class="count"><%= tag.taggings.count %></td>
   <td class="tools">

data/lib/alchemy/controller_actions.rb

@@ -59,17 +59,15 @@ module Alchemy
       Site.current = current_alchemy_site
     end
 
-    # Try to find and stores current language for Alchemy.
+    # Sets the current language for Alchemy.
     #
     def set_alchemy_language(lang = nil)
       @language = if lang
         lang.is_a?(Language) ? lang : load_alchemy_language_from_id_or_code(lang)
       else
-        # find the best language and remember it for later
-        load_alchemy_language_from_params ||
-          load_alchemy_language_from_session ||
-          Language.default
+        load_alchemy_language_from_params || Language.default
       end
+
       store_current_alchemy_language(@language)
     end
 
@@ -80,26 +78,15 @@ module Alchemy
       end
     end
 
-    # Load language from session if it's present on current site.
-    # Otherwise return nil so we can load the default language from current site.
-    def load_alchemy_language_from_session
-      if session[:alchemy_language_id].present? && Site.current
-        Site.current.languages.find_by(id: session[:alchemy_language_id])
-      end
-    end
-
     def load_alchemy_language_from_id_or_code(id_or_code)
       Language.find_by(id: id_or_code) ||
         Language.find_by_code(id_or_code)
     end
 
-    # Stores language's id in the session.
-    #
-    # Also stores language in +Language.current+
+    # Stores language in +Language.current+
     #
     def store_current_alchemy_language(language)
       if language&.id
-        session[:alchemy_language_id] = language.id
         Language.current = language
       end
     end

data/lib/alchemy/version.rb

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

metadata

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