Merge 84448a7 into de59800

pages/app/views/refinery/admin/pages/_page.html.erb

@@ -48,6 +48,6 @@
   </div>
 
   <%= content_tag :ul, class: 'nested', data: { 'ajax-content': refinery.admin_children_pages_path(page.nested_url) } do %>
-    <%= render(partial: 'page', collection: page.children, cached: true) if Refinery::Pages.auto_expand_admin_tree %>
+    <%= render(partial: 'page', collection: page.children, cached: ->(child_page) { child_page.self_and_descendants }) if Refinery::Pages.auto_expand_admin_tree %>
   <% end %>
 </li>

pages/app/views/refinery/admin/pages/_sortable_list.html.erb

@@ -1,5 +1,5 @@
 <%= content_tag :ul, id: 'sortable_list' do %>
-  <%= render partial: 'page', collection: @pages.roots, cached: true %>
+  <%= render partial: 'page', collection: @pages.roots, cached: ->(child_page) { child_page.self_and_descendants } %>
 <% end %>
 
 <%= render '/refinery/admin/sortable_list', continue_reordering: !!local_assigns[:continue_reordering] %>

pages/app/views/refinery/admin/pages/children.html.erb

@@ -1 +1 @@
-<%= render partial: 'page', collection: @page.children, cached: true %>
+<%= render partial: 'page', collection: @page.children, cached: ->(child_page) { child_page.self_and_descendants } %>

pages/spec/features/refinery/admin/pages_spec.rb

@@ -136,6 +136,13 @@ module Admin
               expect(page).to have_content(team.title)
               expect(page).to have_content(locations.title)
             end
+
+            it "refreshes the cache if sub_children change" do
+              expect(page).to have_content(location.title)
+              location.update(title: 'Las Vegas')
+              visit refinery.admin_pages_path
+              expect(page).to have_content(location.title)
+            end
           end
         end
       end