alchemy_cms 7.1.10 → 7.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b6e517fac0fc0ca7046a00d674d1d11c77bcbaf29a7000ea19a2d124c48fe20
-  data.tar.gz: 3632b9ff0f939eab1222461620ab417a4dac1aed75e56886ae048085d59769ef
+  metadata.gz: 702711d3c433b8ebd8622cb94198dd6ca4d7ff094fb2fb7993ea8ce17ff4d3a5
+  data.tar.gz: cb45c9e7bbf2e9df285dea8e555aa90d96c330159f2604113fbf25389cdf6597
 SHA512:
-  metadata.gz: 377a11eb888da3c77610a5a2f69d5beabca2dfa18a948d1040c2237355a33ab5e83735bf4768bdcae3af804b02c4982fa62542587f4e925f60283efd39cee804
-  data.tar.gz: df98f064d45904b6ef2dcb3cb47e39c8e0fc9487f531e843a8428de6b2387ec2375805814abbb3485c476cdc49a32958cdf104b9b2343b7be707b8a834758566
+  metadata.gz: 574b3bb7e42ce0fdeff179dd37bc19dab1b40038c7514701fe9ae425e8f48972f455030bf8aa735515a5d33fafe91ccbbe80919b751168857646b37745dbee88
+  data.tar.gz: 0dd7baa8ef36719a7b738083741ac81cd498a7826c5464207704e355471448142473409e5f219c7d1490a0018d7f00faa00db6724c4be60d7c99904c3fcab5a0

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 7.1.11 (2024-08-10)
+
+- [7.1-stable] fix PictureEditor defaultCropSize [#2991](https://github.com/AlchemyCMS/alchemy_cms/pull/2991) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.1-stable] Fix combining search filters and pagination [#2981](https://github.com/AlchemyCMS/alchemy_cms/pull/2981) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.1-stable] Clear current language when switching sites [#2973](https://github.com/AlchemyCMS/alchemy_cms/pull/2973) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.1-stable] Remove call to missing content_positions task [#2962](https://github.com/AlchemyCMS/alchemy_cms/pull/2962) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.1-stable] Fix re-render of layoutpages form if validation fails [#2953](https://github.com/AlchemyCMS/alchemy_cms/pull/2953) ([alchemycms-bot](https://github.com/alchemycms-bot))
+
 ## 7.1.10 (2024-06-27)
 
 - [7.1-stable] Prevent Javascript error if the page will be unlocked [#2945](https://github.com/AlchemyCMS/alchemy_cms/pull/2945) ([alchemycms-bot](https://github.com/alchemycms-bot))

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

@@ -17,6 +17,25 @@ module Alchemy
       def edit
         @page = Page.find(params[:id])
       end
+
+      def update
+        @page = Page.find(params[:id])
+        if @page.update(page_params)
+          @notice = Alchemy.t("Page saved", name: @page.name)
+          render "alchemy/admin/pages/update"
+        else
+          render :edit, status: :unprocessable_entity
+        end
+      end
+
+      private
+
+      def page_params
+        params.require(:page).permit(
+          :name,
+          :tag_list
+        )
+      end
     end
   end
 end

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

@@ -6,11 +6,21 @@ module Alchemy
       extend ActiveSupport::Concern
 
       included do
+        # This needs to happen before BaseController#current_alchemy_site sets the session value.
+        prepend_before_action :clear_current_language_from_session, if: :switching_site?, only: :index
         before_action :load_current_language
       end
 
       private
 
+      def switching_site?
+        params[:site_id].present? && (params[:site_id] != session[:alchemy_site_id]&.to_s)
+      end
+
+      def clear_current_language_from_session
+        session.delete(:alchemy_language_id)
+      end
+
       def load_current_language
         @current_language = if session[:alchemy_language_id].present?
           set_alchemy_language(session[:alchemy_language_id])

data/app/javascript/alchemy_admin/picture_editors.js

@@ -7,7 +7,7 @@ const UPDATE_DELAY = 125
 const IMAGE_PLACEHOLDER = '<i class="icon ri-image-line ri-fw"></i>'
 const THUMBNAIL_SIZE = "160x120"
 
-class PictureEditor {
+export class PictureEditor {
   constructor(container) {
     this.container = container
     this.cropFromField = container.querySelector("[data-crop-from]")
@@ -131,10 +131,10 @@ class PictureEditor {
     if (!this.imageCropperEnabled) return []
 
     const mask = this.targetSize.split("x").map((n) => parseInt(n))
-    const zoom = max([
+    const zoom = max(
       mask[0] / this.imageFileWidth,
       mask[1] / this.imageFileHeight
-    ])
+    )
 
     return [Math.round(mask[0] / zoom), Math.round(mask[1] / zoom)]
   }

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

@@ -1,4 +1,4 @@
-<%= alchemy_form_for [:admin, @page], class: 'edit_page' do |f| %>
+<%= alchemy_form_for [:admin, @page], url: alchemy.admin_layoutpage_path(@page), class: 'edit_page' do |f| %>
   <%= f.input :name, autofocus: true %>
   <div class="input string">
     <%= f.label :tag_list %>

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? ActionController::Parameters %>
+    <% if value.respond_to?(:keys) %>
       <% value.each do |k, v| %>
         <%= hidden_field_tag "#{key}[#{k}]", v, id: nil %>
       <% end %>

data/config/routes.rb

@@ -50,7 +50,7 @@ Alchemy::Engine.routes.draw do
       end
     end
 
-    resources :layoutpages, only: [:index, :edit]
+    resources :layoutpages, only: [:index, :edit, :update]
 
     resources :pictures, except: [:new] do
       collection do

data/lib/alchemy/permissions.rb

@@ -96,7 +96,7 @@ module Alchemy
         can :leave, :alchemy_admin
         can [:info, :help], :alchemy_admin_dashboard
         can :manage, :alchemy_admin_clipboard
-        can :edit, :alchemy_admin_layoutpages
+        can :update, :alchemy_admin_layoutpages
         can :tree, :alchemy_admin_pages
 
         # Resources

data/lib/alchemy/test_support/current_language_shared_examples.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples_for "a controller that loads current language" do |args|
+  context "when session has current language id key" do
+    let!(:site_1) { create(:alchemy_site) }
+    let!(:site_1_default_language) { create :alchemy_language, site: site_1, default: true }
+    let!(:another_site_1_language) { create :alchemy_language, site: site_1, code: :de }
+    let(:site_2) { create :alchemy_site, host: "another.host", languages: [build(:alchemy_language, code: :en), build(:alchemy_language, code: :de)] }
+
+    context "on index action" do
+      context "when switching the current site" do
+        before do
+          session[:alchemy_site_id] = site_1.id
+          session[:alchemy_language_id] = another_site_1_language.id
+        end
+
+        it "sets @current_language to the new site default language" do
+          get :index, params: {site_id: site_2.id}
+          expect(assigns(:current_language)).to eq site_2.default_language
+        end
+      end
+
+      context "when no language to set" do
+        it "shows flash warning with redirect" do
+          Alchemy::Language.destroy_all
+          get :index, params: {site_id: site_1.id}
+          expect(flash[:warning]).to eq Alchemy.t("Please create a language first.")
+          expect(response).to redirect_to admin_languages_path
+        end
+      end
+    end
+  end
+end

data/lib/alchemy/version.rb

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

data/lib/tasks/alchemy/tidy.rake

@@ -7,7 +7,6 @@ namespace :alchemy do
     desc "Tidy up Alchemy database."
     task :up do
       Rake::Task["alchemy:tidy:element_positions"].invoke
-      Rake::Task["alchemy:tidy:content_positions"].invoke
       Rake::Task["alchemy:tidy:remove_orphaned_records"].invoke
       Rake::Task["alchemy:tidy:remove_trashed_elements"].invoke
       Rake::Task["alchemy:tidy:remove_duplicate_legacy_urls"].invoke

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 7.1.10
+  version: 7.1.11
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-27 00:00:00.000000000 Z
+date: 2024-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1304,6 +1304,7 @@ files:
 - lib/alchemy/test_support.rb
 - lib/alchemy/test_support/capybara_helpers.rb
 - lib/alchemy/test_support/config_stubbing.rb
+- lib/alchemy/test_support/current_language_shared_examples.rb
 - lib/alchemy/test_support/factories/attachment_factory.rb
 - lib/alchemy/test_support/factories/dummy_user_factory.rb
 - lib/alchemy/test_support/factories/element_factory.rb