2 files changed, 7 insertions, 0 deletions

diff --git a/app/helpers/content_helper.rb b/app/helpers/content_helper.rb
index 6043089..6bcd437 100644
--- a/app/helpers/content_helper.rb
+++ b/app/helpers/content_helper.rb
@@ -108,6 +108,7 @@ module ContentHelper
         end
 
         options[:partial] = select_partial(options[:partial])
+        options[:node] = @page.node if options[:children].present?
 
         sanitize(content.sub(tag, render_collection(options)), :attributes => cccms_attributes)
       else
diff --git a/app/models/page.rb b/app/models/page.rb
index 4d1e94a..6fff7d6 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -63,6 +63,12 @@ class Page < ApplicationRecord
       end
     end
 
+    if options[:node] && options[:children] == "direct"
+      scope = scope.where(nodes: { parent_id: options[:node].id })
+    elsif options[:node] && options[:children] == "all"
+      scope = scope.where(nodes: { id: options[:node].descendants.pluck(:id) })
+    end
+
     direction = %w[ASC DESC].include?(options[:order_direction]&.upcase) ? options[:order_direction].upcase : "ASC"
 
     if options[:order_by] == "title"