alchemy_cms 7.2.2 → 7.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eec1db3fc77450fd504e9366e981397f2fc0ed2057d9e2cc2051f6b4939966ca
-  data.tar.gz: c2beac93474a39df8ae3d73e3c2ebfe7be3904cc8fee0f8b6a7cd444aee33aff
+  metadata.gz: 3f9a554636616ea87a438350ad7e91462a8b2196047504d81669782b8d08a6d8
+  data.tar.gz: 6897d00c7e23af4de0023fb6c2f63819e7de68a549274afb5c258463e3924482
 SHA512:
-  metadata.gz: 91a00fde6f54893e9f86f89ce498c90e074a085100c813cb2b9bc1b034e570a08fde1cc671bd02b1aad4d708485f1f0100bb0ec601279df10b0db854a2848e0b
-  data.tar.gz: 4bc2b6cda15c88984ba8ab267bbf7716b5f282266b12af337a4093f66359e9badf47f741b9737fe6aebb7c5f57fa3b2114fb441dc1b22c6a16e382ad0166bd36
+  metadata.gz: e446096fe1d3e1aa5dcc327ad1b7d779447b668c7294d83a4789f2694a0c7e90ee053c422e17bd8168bcaf420a0909b3614ec3302c33986235ef02459eb29074
+  data.tar.gz: 52851127d29b47907b9c9ea25ead515bb94060962585e7c70afc65f2cb426c7dfc63d65263e16d21e157b0f1786391fea1410327d8669bee9b5b7a3aa3c3897a

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 7.2.4 (2024-08-10)
+
+- [7.2-stable] Fix margin of alchemy-message in alchemy-dialog [#2993](https://github.com/AlchemyCMS/alchemy_cms/pull/2993) ([tvdeyen](https://github.com/tvdeyen))
+- [7.2-stable] fix PictureEditor defaultCropSize [#2992](https://github.com/AlchemyCMS/alchemy_cms/pull/2992) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.2] Resource Controller: Allow additional Ransack filters [#2985](https://github.com/AlchemyCMS/alchemy_cms/pull/2985) ([mamhoff](https://github.com/mamhoff))
+- [7.2-stable] Fix combining search filters and pagination [#2982](https://github.com/AlchemyCMS/alchemy_cms/pull/2982) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.2-stable] Clear current language when switching sites [#2974](https://github.com/AlchemyCMS/alchemy_cms/pull/2974) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.2-stable] Update _autocomplete_tag_list.html.erb [#2966](https://github.com/AlchemyCMS/alchemy_cms/pull/2966) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.2-stable] Remove call to missing content_positions task [#2963](https://github.com/AlchemyCMS/alchemy_cms/pull/2963) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.2-stable] Fix re-render of layoutpages form if validation fails [#2954](https://github.com/AlchemyCMS/alchemy_cms/pull/2954) ([alchemycms-bot](https://github.com/alchemycms-bot))
+
+## 7.2.3 (2024-06-27)
+
+- [7.2-stable] Disable Turbo Prefetch in Admin [#2947](https://github.com/AlchemyCMS/alchemy_cms/pull/2947) ([tvdeyen](https://github.com/tvdeyen))
+- [7.2-stable] Prevent Javascript error if the page will be unlocked [#2946](https://github.com/AlchemyCMS/alchemy_cms/pull/2946) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.2-stable] fix(ContactMessages): Use alchemy route proxy [#2929](https://github.com/AlchemyCMS/alchemy_cms/pull/2929) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.2-stable] [js] Update tinymce 7.1.0 → 7.1.1 (patch) [#2921](https://github.com/AlchemyCMS/alchemy_cms/pull/2921) ([alchemycms-bot](https://github.com/alchemycms-bot))
+
 ## 7.2.2 (2024-06-04)
 
 - [7.2-stable] fix(RoutingConstraints): Allow Turbo Stream requests [#2916](https://github.com/AlchemyCMS/alchemy_cms/pull/2916) ([alchemycms-bot](https://github.com/alchemycms-bot))

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

@@ -82,13 +82,15 @@ $dialog-transition-duration: 150ms;
     }
 
     form,
-    .info.message {
+    .info.message,
+    alchemy-message[type="info"] {
       position: absolute;
       right: 2 * $default-padding;
       width: 256px;
     }
 
-    .info.message {
+    .info.message,
+    alchemy-message[type="info"] {
       top: 2 * $default-padding;
       margin: 0 0 0 8px;
       padding: 0 8px 0 32px;
@@ -158,14 +160,16 @@ $dialog-transition-duration: 150ms;
   position: relative;
   color: $text-color;
 
-  .message {
+  .message,
+  alchemy-message {
     margin: 8px;
   }
 
   &.padded {
     padding: 4 * $default-padding;
 
-    .message {
+    .message,
+    alchemy-message {
       margin: 0 0 8px 0;
     }
   }

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

@@ -43,4 +43,8 @@ body.error {
     max-height: 100%;
     overflow-y: scroll;
   }
+
+  alchemy-message[type="error"] {
+    margin: 0;
+  }
 }

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

@@ -200,10 +200,7 @@ module Alchemy
       def common_search_filter_includes
         search_filters = [
           {
-            q: [
-              resource_handler.search_field_name,
-              :s
-            ]
+            q: [:s] + permitted_ransack_search_fields
           },
           :tagged_with,
           :page,
@@ -219,6 +216,12 @@ module Alchemy
         search_filters
       end
 
+      def permitted_ransack_search_fields
+        [
+          resource_handler.search_field_name
+        ]
+      end
+
       def items_per_page
         cookies[:alchemy_items_per_page] =
           params[:per_page] || cookies[:alchemy_items_per_page] || Alchemy::Config.get(:items_per_page)

data/app/controllers/alchemy/messages_controller.rb

@@ -97,7 +97,7 @@ module Alchemy
       else
         Language.current_root_page.urlname
       end
-      redirect_to show_page_path(
+      redirect_to alchemy.show_page_path(
         urlname: urlname,
         locale: prefix_locale? ? Current.language.code : nil
       )

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

@@ -8,7 +8,7 @@ const UPDATE_DELAY = 125
 const IMAGE_PLACEHOLDER = '<alchemy-icon name="image"></alchemy-icon>'
 const THUMBNAIL_SIZE = "160x120"
 
-class PictureEditor {
+export class PictureEditor {
   constructor(container) {
     this.container = container
     this.cropFromField = container.querySelector("[data-crop-from]")
@@ -132,10 +132,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 %>
   <%= render Alchemy::Admin::TagsAutocomplete.new do %>
     <%= f.input :tag_list, input_html: { value: f.object.tag_list.join(",") } %>

data/app/views/alchemy/admin/pages/unlock.js.erb

@@ -15,6 +15,6 @@
     }
     locked_page_icon.outerHTML = locked_page_icon_content
   }
-  document.querySelector("#page_<%= @page.id -%> .page_status.locked").remove()
+  document.querySelector("#page_<%= @page.id -%> .page_status.locked")?.remove()
   Alchemy.growl('<%= flash[:notice] -%>')
 })()

data/app/views/alchemy/admin/partials/_autocomplete_tag_list.html.erb

@@ -1,3 +1,3 @@
 <%= render Alchemy::Admin::TagsAutocomplete.new do %>
-  <%= f.text_field :tag_list, value: object.tag_list.join(",") %>
+  <%= f.text_field :tag_list, value: f.object.tag_list.join(",") %>
 <% end %>

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/app/views/layouts/alchemy/admin.html.erb

@@ -8,6 +8,7 @@
     <%= csrf_meta_tag %>
     <meta name="robots" content="noindex">
     <meta name="alchemy-icon-sprite" content="<%= asset_path("remixicon.symbol.svg") %>">
+    <meta name="turbo-prefetch" content="false">
     <%= stylesheet_link_tag('alchemy/admin/all', media: 'screen', 'data-turbo-track' => true) %>
     <%= stylesheet_link_tag('alchemy/print', media: 'print', 'data-turbo-track' => true) %>
     <%= yield :stylesheets %>

data/config/routes.rb

@@ -49,7 +49,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.2.2"
+  VERSION = "7.2.4"
 
   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

data/package.json

@@ -17,7 +17,7 @@
     "flatpickr": "^4.6.13",
     "keymaster": "^1.6.2",
     "sortablejs": "^1.15.2",
-    "tinymce": "^7.1.0"
+    "tinymce": "^7.1.1"
   },
   "devDependencies": {
     "@babel/core": "^7.24.5",