alchemy_cms 7.0.7 → 7.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eb0c05455de8ab6f10985ac53819ce4c3c31648b93909f933dc57af4f056f3d
-  data.tar.gz: 43f67834df294087fed4fc699a9a91a30988f0f08e798b02c8c87e96d5373592
+  metadata.gz: 8da1dca92c99bbe46045a378b3a2f9b7585c168adf95c5887f487e6145ccc8fa
+  data.tar.gz: 2b03c7720954bd3293b461ea3888cbdc7688658cf4d55ee93f34d0ee0665b784
 SHA512:
-  metadata.gz: 7cc55a633a63004a971e0ac070bfa0e9b7bcce2070b06086204f50cea1619cd3d83592b6b4bb33ad044bf17525b36fc3374fb00c689a069d917242364bf424c1
-  data.tar.gz: 33d84a1857ebc5a2cbb26fc48bb18b355a1aeb7e007cadb7151bb5e567e6148deb0f40d6c2376c144419450c3f67eedcb8f04e29b51b26cf9cc0201207d80490
+  metadata.gz: fb3960ce49c6f137040b72458438fff2bb698898fe9ad64370980dd4dcd97df9cbce2033f5b13b2011e40c173b6acc7b9a05ef1146a1d042f1adbf755734eb57
+  data.tar.gz: 86bd60f2a5af41044b7fa23245bd82ed4e204ad01a1630efcc5327d7b25ee38500e69fa8fcf69bd55c2048687279ff8394c5c98601d4a0edc0f63438924e23cb

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 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))
+- [7.0] Fix humanization for add nested element button [#2659](https://github.com/AlchemyCMS/alchemy_cms/pull/2659) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 7.0.7 (2023-11-28)
 
 - [7.0] Disable Turbolinks on menubar [#2622](https://github.com/AlchemyCMS/alchemy_cms/pull/2622) ([tvdeyen](https://github.com/tvdeyen))

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/alchemy/admin/resources_controller.rb

@@ -34,16 +34,16 @@ module Alchemy
         respond_to do |format|
           format.html do
             items = items.page(params[:page] || 1).per(items_per_page)
-            instance_variable_set("@#{resource_handler.resources_name}", items)
+            instance_variable_set(:"@#{resource_handler.resources_name}", items)
           end
           format.csv do
-            instance_variable_set("@#{resource_handler.resources_name}", items)
+            instance_variable_set(:"@#{resource_handler.resources_name}", items)
           end
         end
       end
 
       def new
-        instance_variable_set("@#{resource_handler.resource_name}", resource_handler.model.new)
+        instance_variable_set(:"@#{resource_handler.resource_name}", resource_handler.model.new)
       end
 
       def show
@@ -54,7 +54,7 @@ module Alchemy
       end
 
       def create
-        instance_variable_set("@#{resource_handler.resource_name}", resource_handler.model.new(resource_params))
+        instance_variable_set(:"@#{resource_handler.resource_name}", resource_handler.model.new(resource_params))
         resource_instance_variable.save
         render_errors_or_redirect(
           resource_instance_variable,
@@ -169,7 +169,7 @@ module Alchemy
       end
 
       def load_resource
-        instance_variable_set("@#{resource_handler.resource_name}", resource_handler.model.find(params[:id]))
+        instance_variable_set(:"@#{resource_handler.resource_name}", resource_handler.model.find(params[:id]))
       end
 
       def authorize_resource

data/app/controllers/alchemy/messages_controller.rb

@@ -77,15 +77,15 @@ module Alchemy
     end
 
     def mail_to
-      @element.ingredient(:mail_to) || mailer_config["mail_to"]
+      @element.value_for(:mail_to) || mailer_config["mail_to"]
     end
 
     def mail_from
-      @element.ingredient(:mail_from) || mailer_config["mail_from"]
+      @element.value_for(:mail_from) || mailer_config["mail_from"]
     end
 
     def subject
-      @element.ingredient(:subject) || mailer_config["subject"]
+      @element.value_for(:subject) || mailer_config["subject"]
     end
 
     def redirect_to_success_page
@@ -104,7 +104,7 @@ module Alchemy
     end
 
     def success_page
-      @_success_page ||= @element.ingredient(:success_page)
+      @_success_page ||= @element.value_for(:success_page)
     end
 
     def success_page_urlname

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/element/element_ingredients.rb

@@ -158,8 +158,8 @@ module Alchemy
               "#{name}.#{role}.#{error}",
               scope: "ingredient_validations",
               default: [
-                "fields.#{role}.#{error}".to_sym,
-                "errors.#{error}".to_sym
+                :"fields.#{role}.#{error}",
+                :"errors.#{error}"
               ],
               field: Alchemy::Ingredient.translated_label_for(role, name)
             )

data/app/models/alchemy/ingredient.rb

@@ -45,14 +45,14 @@ module Alchemy
       # @param [String] The class name of the related object
       def related_object_alias(name, class_name:)
         alias_method name, :related_object
-        alias_method "#{name}=", :related_object=
+        alias_method :"#{name}=", :related_object=
 
         # Somehow Rails STI does not allow us to use `alias_method` for the related_object_id
-        define_method "#{name}_id" do
+        define_method :"#{name}_id" do
           related_object_id
         end
 
-        define_method "#{name}_id=" do |id|
+        define_method :"#{name}_id=" do |id|
           self.related_object_id = id
           self.related_object_type = class_name
         end

data/app/models/alchemy/ingredient_validator.rb

@@ -51,10 +51,10 @@ module Alchemy
       validations.each do |validation|
         if validation.respond_to?(:keys)
           validation.map do |key, value|
-            send("validate_#{key}", value)
+            send(:"validate_#{key}", value)
           end
         else
-          send("validate_#{validation}")
+          send(:"validate_#{validation}")
         end
       end
     end

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/models/alchemy/page.rb

@@ -581,7 +581,7 @@ module Alchemy
 
     def set_fixed_attributes
       fixed_attributes.all.each do |attribute, value|
-        send("#{attribute}=", value)
+        send(:"#{attribute}=", value)
       end
     end
 

data/app/models/concerns/alchemy/picture_thumbnails.rb

@@ -168,7 +168,7 @@ module Alchemy
     def fix_crop_values
       %i[crop_from crop_size].each do |crop_value|
         if public_send(crop_value).is_a?(String)
-          public_send("#{crop_value}=", normalize_crop_value(crop_value))
+          public_send(:"#{crop_value}=", normalize_crop_value(crop_value))
         end
       end
     end

data/app/views/alchemy/admin/elements/_add_nested_element_form.html.erb

@@ -1,7 +1,7 @@
 <%= content_tag :div, class: 'add-nested-element', data: { element_id: element.id } do %>
   <% if element.expanded? || element.fixed? %>
-    <% if element.nestable_elements.length == 1 && 
-      (nestable_element = element.nestable_elements.first) && 
+    <% if element.nestable_elements.length == 1 &&
+      (nestable_element = element.nestable_elements.first) &&
       Alchemy::Element.all_from_clipboard_for_parent_element(get_clipboard("elements"), element).none?
     %>
       <%= form_for [:admin, Alchemy::Element.new(name: nestable_element)],
@@ -10,11 +10,11 @@
         <%= f.hidden_field :page_version_id, value: element.page_version_id %>
         <%= f.hidden_field :parent_element_id, value: element.id %>
         <button class="button add-nestable-element-button" data-alchemy-button>
-          <%= Alchemy.t(:add_nested_element, name: Alchemy.t(nestable_element, scope: 'element_names')) %>
+          <%= Alchemy.t(:add_nested_element, name: Alchemy.t(nestable_element.to_sym, scope: 'element_names')) %>
         </button>
       <% end %>
     <% else %>
-      <%= link_to_dialog (nestable_element ? Alchemy.t(:add_nested_element, name: Alchemy.t(nestable_element, scope: 'element_names')) : Alchemy.t("New Element")),
+      <%= link_to_dialog (nestable_element ? Alchemy.t(:add_nested_element, name: Alchemy.t(nestable_element.to_sym, scope: 'element_names')) : Alchemy.t("New Element")),
         alchemy.new_admin_element_path(
           parent_element_id: element.id,
           page_version_id: element.page_version_id
@@ -24,4 +24,4 @@
         }, class: "button add-nestable-element-button" %>
     <% end %>
   <% end %>
-<% end %>
+<% 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.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/resource.rb

@@ -108,7 +108,7 @@ module Alchemy
     def initialize(controller_path, module_definition = nil, custom_model = nil)
       @controller_path = controller_path
       @module_definition = module_definition
-      @model = (custom_model || guess_model_from_controller_path)
+      @model = custom_model || guess_model_from_controller_path
       if model.respond_to?(:alchemy_resource_relations)
         if !model.respond_to?(:reflect_on_all_associations)
           raise MissingActiveRecordAssociation
@@ -320,7 +320,7 @@ module Alchemy
       model.alchemy_resource_relations.each do |name, options|
         relation_name = name.to_s.gsub(/_id$/, "") # ensure that we don't have an id
         association = association_from_relation_name(relation_name)
-        foreign_key = association.options[:foreign_key] || "#{association.name}_id".to_sym
+        foreign_key = association.options[:foreign_key] || :"#{association.name}_id"
         collection = options[:collection] || resource_relation_class(association).all
         resource_relations[foreign_key] = options.merge(
           model_association: association,

data/lib/alchemy/resources_helper.rb

@@ -14,11 +14,11 @@ module Alchemy
     end
 
     def resource_instance_variable
-      instance_variable_get("@#{resource_handler.resource_name}")
+      instance_variable_get(:"@#{resource_handler.resource_name}")
     end
 
     def resources_instance_variable
-      instance_variable_get("@#{resource_handler.resources_name}")
+      instance_variable_get(:"@#{resource_handler.resources_name}")
     end
 
     def resource_url_proxy
@@ -46,7 +46,7 @@ module Alchemy
     end
 
     def edit_resource_path(resource = nil, options = {})
-      path_segments = (resource_scope + [resource] || resource_handler.resource_array)
+      path_segments = resource_scope + [resource] || resource_handler.resource_array
       edit_polymorphic_path path_segments, options
     end
 

data/lib/alchemy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 7.0.7
+  version: 7.0.9
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-28 00:00:00.000000000 Z
+date: 2024-02-27 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.4.17
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails