alchemy_cms 6.0.13 → 6.0.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/workflows/ci.yml +4 -1
- data/CHANGELOG.md +4 -0
- data/app/controllers/alchemy/pages_controller.rb +5 -19
- data/lib/alchemy/version.rb +1 -1
- data/package.json +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 7660ee7a4387ae1ae5293069a13ea8f23be271fe0238366fc11415ede97123b6
|
|
4
|
+
data.tar.gz: '0691e8d6635818e96526819efd18325419e1fade8e44b488de68e0553c69097d'
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ed74ebd703752b44d09b583ce5e46eb939936841982683ff613d177ab3bc295246d1cc55cc976c634c3c22d1e8063175709ab0f3ce20046738957daceee9129d
|
|
7
|
+
data.tar.gz: 219dd97a18c9a2d784099006277b60b3607f6d635c59559464aa66ba354e368ca642aee211036e4abde42745f73faee9d20ff4ad502123a82c433964443146ec
|
data/.github/workflows/ci.yml
CHANGED
|
@@ -4,7 +4,7 @@ on: [push, pull_request]
|
|
|
4
4
|
|
|
5
5
|
jobs:
|
|
6
6
|
RSpec:
|
|
7
|
-
runs-on: ubuntu-
|
|
7
|
+
runs-on: ubuntu-latest
|
|
8
8
|
strategy:
|
|
9
9
|
fail-fast: false
|
|
10
10
|
matrix:
|
|
@@ -82,6 +82,9 @@ jobs:
|
|
|
82
82
|
sudo apt update -qq
|
|
83
83
|
sudo apt install -qq --fix-missing libmysqlclient-dev -o dir::cache::archives="/home/runner/apt/cache"
|
|
84
84
|
sudo chown -R runner /home/runner/apt/cache
|
|
85
|
+
- uses: actions/setup-node@v3
|
|
86
|
+
with:
|
|
87
|
+
node-version: 16
|
|
85
88
|
- name: Restore node modules cache
|
|
86
89
|
id: yarn-cache
|
|
87
90
|
uses: actions/cache@v2.1.3
|
data/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 6.0.14 (2023-05-18)
|
|
4
|
+
|
|
5
|
+
- [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
|
+
|
|
3
7
|
## 6.0.13 (2023-03-29)
|
|
4
8
|
|
|
5
9
|
- Fix installer: Add seeds file if not exists [#2446](https://github.com/AlchemyCMS/alchemy_cms/pull/2446) ([tvdeyen](https://github.com/tvdeyen))
|
|
@@ -104,14 +104,7 @@ module Alchemy
|
|
|
104
104
|
# If no index page and no admin users are present we show the "Welcome to Alchemy" page.
|
|
105
105
|
#
|
|
106
106
|
def load_index_page
|
|
107
|
-
@page ||=
|
|
108
|
-
Alchemy::Page.
|
|
109
|
-
contentpages.
|
|
110
|
-
language_roots.
|
|
111
|
-
where(language: Language.current).
|
|
112
|
-
includes(page_includes).
|
|
113
|
-
first
|
|
114
|
-
end
|
|
107
|
+
@page ||= Language.current_root_page
|
|
115
108
|
render template: "alchemy/welcome", layout: false if signup_required?
|
|
116
109
|
end
|
|
117
110
|
|
|
@@ -127,13 +120,10 @@ module Alchemy
|
|
|
127
120
|
def load_page
|
|
128
121
|
page_not_found! unless Language.current
|
|
129
122
|
|
|
130
|
-
@page ||=
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
includes(page_includes).
|
|
135
|
-
find_by(urlname: params[:urlname])
|
|
136
|
-
end
|
|
123
|
+
@page ||= Language.current.pages.contentpages.find_by(
|
|
124
|
+
urlname: params[:urlname],
|
|
125
|
+
language_code: params[:locale] || Language.current.code,
|
|
126
|
+
)
|
|
137
127
|
end
|
|
138
128
|
|
|
139
129
|
def enforce_locale
|
|
@@ -244,9 +234,5 @@ module Alchemy
|
|
|
244
234
|
def page_not_found!
|
|
245
235
|
not_found_error!("Alchemy::Page not found \"#{request.fullpath}\"")
|
|
246
236
|
end
|
|
247
|
-
|
|
248
|
-
def page_includes
|
|
249
|
-
Alchemy::EagerLoading.page_includes(version: :public_version)
|
|
250
|
-
end
|
|
251
237
|
end
|
|
252
238
|
end
|
data/lib/alchemy/version.rb
CHANGED
data/package.json
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: alchemy_cms
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 6.0.
|
|
4
|
+
version: 6.0.14
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Thomas von Deyen
|
|
@@ -13,7 +13,7 @@ authors:
|
|
|
13
13
|
autorequire:
|
|
14
14
|
bindir: bin
|
|
15
15
|
cert_chain: []
|
|
16
|
-
date: 2023-
|
|
16
|
+
date: 2023-05-18 00:00:00.000000000 Z
|
|
17
17
|
dependencies:
|
|
18
18
|
- !ruby/object:Gem::Dependency
|
|
19
19
|
name: actionmailer
|
|
@@ -1511,7 +1511,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
1511
1511
|
version: '0'
|
|
1512
1512
|
requirements:
|
|
1513
1513
|
- ImageMagick (libmagick), v6.6 or greater.
|
|
1514
|
-
rubygems_version: 3.4.
|
|
1514
|
+
rubygems_version: 3.4.12
|
|
1515
1515
|
signing_key:
|
|
1516
1516
|
specification_version: 4
|
|
1517
1517
|
summary: A powerful, userfriendly and flexible CMS for Rails
|