alchemy_cms 7.0.8 → 7.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e20dfb7c8a1477928f962a4494fb7f3856a84a718a90474d21604617cfa6999
-  data.tar.gz: d4f9e69df4d2ce7916a778e16102eb235c1d92b51a617df339ed33afb45e4cf0
+  metadata.gz: 03740f526e8baf73a62015e776b187264ab994a64237343fae75cd2f9f48eade
+  data.tar.gz: 5e8acf12fa9aaccc71f62964f75138d2c759d8e4f927a8e090d63e289c583f17
 SHA512:
-  metadata.gz: 8cbafabbd80e853cf661a7ec3b88777c21d4a445ccd6076683780cc0da0c7164b7747a9504ceebf44bd35207dc969d302d158680c6feffe78da34118c12351de
-  data.tar.gz: ebcdcd1bc921de896168dd5acc71f87f6f3a05c28fea381da3fad15e0245400c61956c1062b2a89444a333e458f5db196fdc97f6d252f0ef1f7152105de50e9a
+  metadata.gz: ff2dacd727ac7cb03618af13a2b7fe518ac38eba5b0dc39c551410f1510347e5056a784294a80ec38d4334fc65c6c97d4cf0cda43b42fbddb64b8907eaa664f8
+  data.tar.gz: 98beefe383887b24cdf7c2dd07544bba39e073f2e7a61163f3c59f41041f7502c73464a0a2392e84bb35e7ef125e66a75e2bd166cfc64308596e26e65f085a95

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 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))
+
+## 7.0.9 (2024-02-27)
+
+- [7.0] Fix tags view for missing taggables [#2757](https://github.com/AlchemyCMS/alchemy_cms/pull/2757) ([tvdeyen](https://github.com/tvdeyen))
+- [7.0-stable] Merge pull request #2752 from tvdeyen/fix-copy-elements-order [#2753](https://github.com/AlchemyCMS/alchemy_cms/pull/2753) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.0-stable] Merge pull request #2689 from robinboening/fix_switching_to_default_language [#2745](https://github.com/AlchemyCMS/alchemy_cms/pull/2745) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.0-stable] Merge pull request #2720 from sascha-karnatz/restrict-turbo-rails-version [#2725](https://github.com/AlchemyCMS/alchemy_cms/pull/2725) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.0-stable] Merge pull request #2665 from tvdeyen/resource-filter-fixes [#2668](https://github.com/AlchemyCMS/alchemy_cms/pull/2668) ([alchemycms-bot](https://github.com/alchemycms-bot))
+
 ## 7.0.8 (2023-12-28)
 
 - [7.0-stable] Merge pull request #2658 from tvdeyen/fix-contactform-mailer [#2660](https://github.com/AlchemyCMS/alchemy_cms/pull/2660) ([alchemycms-bot](https://github.com/alchemycms-bot))

data/alchemy_cms.gemspec

@@ -51,7 +51,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "sassc-rails", ["~> 2.1"]
   gem.add_runtime_dependency "simple_form", [">= 4.0", "< 6"]
   gem.add_runtime_dependency "sprockets", [">= 3.0", "< 5"]
-  gem.add_runtime_dependency "turbo-rails", [">= 1.4"]
+  gem.add_runtime_dependency "turbo-rails", [">= 1.4", "< 2"]
   gem.add_runtime_dependency "view_component", ["~> 3.0"]
 
   gem.add_development_dependency "capybara", ["~> 3.0"]

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/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/resources/_filter.html.erb

@@ -3,7 +3,7 @@
   <%= select_tag(
     filter.name,
     options_for_select(
-      filter.options_for_select, params[:filter].try(:[], filter.name)
+      filter.options_for_select, search_filter_params.dig(:filter, filter.name)
     ),
     include_blank: Alchemy.t(:all, scope: ['resources', resource_name, 'filters']),
     data: { remote: !!request.xhr? },

data/app/views/alchemy/admin/resources/_per_page_select.html.erb

@@ -1,6 +1,6 @@
 <%= form_tag url_for, method: :get, class: 'per-page-select-form' do |f| %>
   <% search_filter_params.reject { |k, _| k == 'page' || k == 'per_page' }.each do |key, value| %>
-    <% if value.is_a? Hash %>
+    <% if value.is_a? ActionController::Parameters %>
       <% value.each do |k, v| %>
         <%= hidden_field_tag "#{key}[#{k}]", v, id: nil %>
       <% end %>

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

@@ -1,8 +1,12 @@
 <tr class="<%= cycle('even', 'odd') %>">
   <td class="icon"><%= render_icon :tag %></td>
   <td class="name"><%= tag.name %></td>
-  <td class="count">
-    <%= tag.taggings.collect(&:taggable).collect { |t| t.class.model_name.human }.uniq.join(', ') %>
+  <td>
+    <% tag.taggings.collect(&:taggable).compact.uniq(&:class).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.0.8"
+  VERSION = "7.0.10"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 7.0.8
+  version: 7.0.10
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-28 00:00:00.000000000 Z
+date: 2024-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -508,6 +508,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -515,6 +518,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: view_component
   requirement: !ruby/object:Gem::Requirement
@@ -1449,7 +1455,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.5.3
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails