alchemy_cms 6.0.13 → 6.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d401fd3a44495f1a096fc4115eec8d32be8862305cc95c35715548147ec7688a
-  data.tar.gz: 8f9a98f79c64acafaad1eaef6358a1ca468ed00cb18e5dff15627f47db028bde
+  metadata.gz: 7660ee7a4387ae1ae5293069a13ea8f23be271fe0238366fc11415ede97123b6
+  data.tar.gz: '0691e8d6635818e96526819efd18325419e1fade8e44b488de68e0553c69097d'
 SHA512:
-  metadata.gz: 7982344f2c8376017f665f70985da9f1263551a9424481646081a7cfa65a6cd65f7e87ee615cbd64ace815b9e6f4450c45625fea87330db7690233cb2b042d63
-  data.tar.gz: 4b148956360c26b3acb5495a341de5a14f809272fb709c856ff878882367af59b7b7a1133731c02e68fad2cf5404e00e5db8730b1b1b91d6a7a2e8511b5872b0
+  metadata.gz: ed74ebd703752b44d09b583ce5e46eb939936841982683ff613d177ab3bc295246d1cc55cc976c634c3c22d1e8063175709ab0f3ce20046738957daceee9129d
+  data.tar.gz: 219dd97a18c9a2d784099006277b60b3607f6d635c59559464aa66ba354e368ca642aee211036e4abde42745f73faee9d20ff4ad502123a82c433964443146ec

data/.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   RSpec:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -82,6 +82,9 @@ jobs:
           sudo apt update -qq
           sudo apt install -qq --fix-missing libmysqlclient-dev -o dir::cache::archives="/home/runner/apt/cache"
           sudo chown -R runner /home/runner/apt/cache
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
       - name: Restore node modules cache
         id: yarn-cache
         uses: actions/cache@v2.1.3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 6.0.14 (2023-05-18)
+
+- [6.0] Do not eager load elements in pages controller [#2474](https://github.com/AlchemyCMS/alchemy_cms/pull/2474) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 6.0.13 (2023-03-29)
 
 - Fix installer: Add seeds file if not exists [#2446](https://github.com/AlchemyCMS/alchemy_cms/pull/2446) ([tvdeyen](https://github.com/tvdeyen))

data/app/controllers/alchemy/pages_controller.rb

@@ -104,14 +104,7 @@ module Alchemy
     # If no index page and no admin users are present we show the "Welcome to Alchemy" page.
     #
     def load_index_page
-      @page ||= begin
-        Alchemy::Page.
-          contentpages.
-          language_roots.
-          where(language: Language.current).
-          includes(page_includes).
-          first
-      end
+      @page ||= Language.current_root_page
       render template: "alchemy/welcome", layout: false if signup_required?
     end
 
@@ -127,13 +120,10 @@ module Alchemy
     def load_page
       page_not_found! unless Language.current
 
-      @page ||= begin
-        Alchemy::Page.
-          contentpages.
-          where(language: Language.current).
-          includes(page_includes).
-          find_by(urlname: params[:urlname])
-      end
+      @page ||= Language.current.pages.contentpages.find_by(
+        urlname: params[:urlname],
+        language_code: params[:locale] || Language.current.code,
+      )
     end
 
     def enforce_locale
@@ -244,9 +234,5 @@ module Alchemy
     def page_not_found!
       not_found_error!("Alchemy::Page not found \"#{request.fullpath}\"")
     end
-
-    def page_includes
-      Alchemy::EagerLoading.page_includes(version: :public_version)
-    end
   end
 end

data/lib/alchemy/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.0.13",
+  "version": "6.0.14",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 6.0.13
+  version: 6.0.14
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1511,7 +1511,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.4.6
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails