alchemy_cms 5.1.5 → 5.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e22cad36f7f22bd3c584b8ec7449098db4664356f44f3dc502ec03b40f6fb37e
-  data.tar.gz: e762d80d1be086a4da0063956187caea7824bf67c556ecb11856af3a33c18988
+  metadata.gz: 97db0fc8f5e73fb4f4c45688f751bc78b5c1d76a1069646cae2796a91f4021fd
+  data.tar.gz: a1b1c75d29f8913e182cb4f9a689e5947208140e1b56b2fde1308457ee7b6f69
 SHA512:
-  metadata.gz: b1e60d6b1edbc55f0419a168296067ac0de8860825288e07c9aa063fc80fde587c8cf18c59d2809a500a13588dfdabdeab038fa0bb83a7811c56d77827005467
-  data.tar.gz: 7f6be2a004959880f66a56007c9648c50ad5ce7f3355e40acc5a487fcdacc82c866fcb291c186b84134903de7019aadbf929e6cc96655e6c61e6d6a64a7be8e6
+  metadata.gz: 6ae402c37db2c099d06d7a7d57376ad6eb98feedad8cadf93da36c110fde4896ce4336641feb827be0409405d6e06df6070c842b3751db32a5aca6219176c280
+  data.tar.gz: 3f795224bff8796c6623e61025e66935859d1d6d352f1a7d7ea884913b8be1fde82914c981f140eee7f06861339a703d8fa8c567d54ef85d64798e26039c583d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 5.1.6 (2021-09-17)
+
+- Use self_and_ancestors in page_active? helper [#2194](https://github.com/AlchemyCMS/alchemy_cms/pull/2194) ([mamhoff](https://github.com/mamhoff))
+
 ## 5.1.5 (2021-09-15)
 
 - generate picture thumbnails only for pictures with convertible format [#2131](https://github.com/AlchemyCMS/alchemy_cms/pull/2131) ([afdev82](https://github.com/afdev82))
@@ -852,3 +856,4 @@ No changes
 ## 3.0.0 (2014-07-03)
 
 [Release Notes](https://github.com/AlchemyCMS/alchemy_cms/releases/tag/v3.0.0)
+

data/app/helpers/alchemy/pages_helper.rb

@@ -100,7 +100,7 @@ module Alchemy
 
     # Returns true if page is in the active branch
     def page_active?(page)
-      @_page_ancestors ||= Page.ancestors_for(@page)
+      @_page_ancestors ||= @page.self_and_ancestors.contentpages
       @_page_ancestors.include?(page)
     end
 

data/lib/alchemy/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "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: 5.1.5
+  version: 5.1.6
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -10,10 +10,10 @@ authors:
 - Hendrik Mans
 - Carsten Fregin
 - Martin Meyerhoff
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -1284,9 +1284,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.2.26
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails
 test_files: []
-...