alchemy_cms 8.1.11 → 8.1.12

data/app/models/alchemy/attachment.rb

@@ -49,24 +49,16 @@ module Alchemy
     # not tracked via the polymorphic +related_object+ association, so the
     # base scope cannot see them.
     #
-    # Uses a correlated +NOT EXISTS+ subquery that builds the per-row LIKE
-    # pattern with +Arel::Nodes::Concat+, which compiles to +||+ on
-    # SQLite/PostgreSQL and +CONCAT()+ on MySQL.
+    # Extracts referenced attachment IDs from ingredient values via Ruby
+    # regex to stay database-agnostic.
     scope :deletable, -> do
-      ingredients = Alchemy::Ingredient.arel_table
-      pattern = Arel::Nodes::Concat.new(
-        Arel::Nodes::Concat.new(
-          Arel::Nodes.build_quoted("%/attachment/"),
-          arel_table[:id]
-        ),
-        Arel::Nodes.build_quoted("/download%")
-      )
-      referenced = ingredients
-        .project(1)
-        .where(ingredients[:value].matches(pattern))
-
-      where("#{table_name}.id NOT IN (#{RelatableResource::RELATED_INGREDIENTS_SUBQUERY})", type: name)
-        .where.not(referenced.exists)
+      referenced_ids = Alchemy::Ingredient
+        .where("value LIKE '%/attachment/%/download%'")
+        .pluck(:value)
+        .flat_map { |v| v.scan(%r{/attachment/(\d+)/download}).flatten.map(&:to_i) }
+
+      scope = where("#{table_name}.id NOT IN (#{RelatableResource::RELATED_INGREDIENTS_SUBQUERY})", type: name)
+      referenced_ids.any? ? scope.where.not(id: referenced_ids) : scope
     end
 
     # We need to define this method here to have it available in the validations below.

data/app/stylesheets/alchemy/admin/notices.scss

@@ -73,6 +73,15 @@ alchemy-message {
     margin-top: 0;
   }
 
+  h1,
+  h2,
+  h3,
+  p {
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
   a[href] {
     text-decoration-color: inherit;
     text-decoration-thickness: 1px;

data/app/views/alchemy/admin/pages/_table.html.erb

@@ -6,7 +6,7 @@
           <%= render_icon "file-edit", size: "xl" %>
         </sl-tooltip>
       <% else %>
-        <%= render_icon "file-edit", size: "xl" %>
+        <%= render_icon "file", size: "xl" %>
       <% end %>
     <% else %>
       <sl-tooltip class="like-hint-tooltip" content="<%= Alchemy.t("Your user role does not allow you to edit this page") %>" placement="bottom-start">

data/lib/alchemy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 8.1.11
+  version: 8.1.12
 platform: ruby
 authors:
 - Thomas von Deyen