alchemy_cms 4.0.4 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4789f71b73e8e1c28df8895f5fd37a5b90871f18454aa06e4a43b1d7449ecdfb
-  data.tar.gz: df714e6c16fef1e84749c65c3a43b2105a45d90d11a90f633bef27980766c6c9
+  metadata.gz: 35a5066f5fee296b67dd64a9d8ddd912a83a4197c4a0c101e9c4ede1973f1af2
+  data.tar.gz: 36bebc442b75517a7f39e15fb6bc7a80ec3f03c1a126a220dfef6dbc4c55e39c
 SHA512:
-  metadata.gz: '08acde8f5cde62a637166deb21acf95dc5496be094aaf6655403e386f4b1a8b3796ca9b45376c9013a13673a0758159d151590208350da4fec5bbca544b217c4'
-  data.tar.gz: 2722b7268f01d730a2ae343189c5e145b786ae39dfdce80d61889776870c3e4badace52e97a888b483e236229f8a19a86b10dc8a8914a329c1213d51154053ea
+  metadata.gz: 3e7de480331dd62d6a65cd477ad95d9e3648e693a6dcd7577ba6faa574204bd9a4fcb66c9b0c3c2599cbb74209f3ae18ff8866ab14c7e59b59fc2d6f3700ec3b
+  data.tar.gz: dbe2c4290d20bb68218f6628165086d3747a5cb6153b891c6618ed4789fae15e1fca231a6b5e6fd78357d20db730e6fbd83b1e845a5099e98fb5a160b03b98f9

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 4.0.5 (unreleased)
+
+- Do not cache sitemap in Turbolinks [#1463](https://github.com/AlchemyCMS/alchemy_cms/pull/1463) ([tvdeyen](https://github.com/tvdeyen))
+- Skip folded deeper levels when rendering page tree [#1324](https://github.com/AlchemyCMS/alchemy_cms/pull/1324) ([pascalj](https://github.com/pascalj))
+
 ## 4.0.4 (2018-09-05)
 
 - Allow Kaminari 1.x [#1467](https://github.com/AlchemyCMS/alchemy_cms/pull/1467) ([tvdeyen](https://github.com/tvdeyen))

data/app/models/alchemy/folded_page.rb

@@ -15,5 +15,10 @@ module Alchemy
     belongs_to :page, required: true
     belongs_to :user, required: true,
       class_name: Alchemy.user_class_name
+
+    def self.folded_for_user(user)
+      return none unless Alchemy.user_class < ActiveRecord::Base
+      where(user: user, folded: true)
+    end
   end
 end

data/app/serializers/alchemy/page_tree_serializer.rb

@@ -10,23 +10,24 @@ module Alchemy
       tree = []
       path = [{id: object.parent_id, children: tree}]
       page_list = object.self_and_descendants
-      skip_branch = false
       base_level = object.level - 1
+      # Load folded pages in advance
+      folded_user_pages = FoldedPage.folded_for_user(opts[:user]).pluck(:page_id)
+      folded_depth = Float::INFINITY
 
       page_list.each_with_index do |page, i|
         has_children = page_list[i + 1] && page_list[i + 1].parent_id == page.id
-        folded = has_children && page.folded?(opts[:user])
+        folded = has_children && folded_user_pages.include?(page.id)
 
-        if skip_branch
-          next if page.parent_id == path.last[:children].last[:id]
-
-          skip_branch = false
+        if page.depth > folded_depth
+          next
+        else
+          folded_depth = Float::INFINITY
         end
 
-        # Do not walk my children if I'm folded and you don't need to have the
-        # full tree.
+        # If this page is folded, skip all pages that are on a higher level (further down the tree).
         if folded && !opts[:full]
-          skip_branch = true
+          folded_depth = page.depth
         end
 
         if page.parent_id != path.last[:id]

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

@@ -1,3 +1,7 @@
+<% content_for :javascript_includes do %>
+  <meta name="turbolinks-cache-control" content="no-cache">
+<% end %>
+
 <% content_for :toolbar do %>
 <div class="toolbar_buttons">
   <%= render 'alchemy/admin/partials/site_select' %>

data/lib/alchemy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-05 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers