radiant-relations-extension 1.2.5 → 1.2.6

data/lib/radiant-relations-extension.rb

@@ -1,3 +1,3 @@
 class RadiantRelationsExtension
-  VERSION = '1.2.5'
+  VERSION = '1.2.6'
 end

data/lib/relations_extension/relations_tags.rb

@@ -24,12 +24,22 @@ module RelationsExtension::RelationsTags
 
   desc %{ Expands only if there are related pages. }
   tag 'if_related_pages' do |tag|
-    tag.expand if tag.locals.page.related_pages.any?
+    tag.locals.related_pages = tag.locals.page.related_pages.dup
+    if tag.attr['from_ancestor']
+      ancestor_path = Page.find(tag.attr['from_ancestor']).path
+      tag.locals.related_pages.delete_if{|p| not p.path =~ /^#{ancestor_path}/ }
+    end
+    tag.expand unless tag.locals.related_pages.empty?
   end
 
   desc %{ Expands only if there are no related pages. }
   tag 'unless_related_pages' do |tag|
-    tag.expand unless tag.locals.page.related_pages.any?
+    tag.locals.related_pages = tag.locals.page.related_pages.dup
+    if tag.attr['from_ancestor']
+      ancestor_path = Page.find(tag.attr['from_ancestor']).path
+      tag.locals.related_pages.delete_if{|p| not p.path =~ /^#{ancestor_path}/ }
+    end
+    tag.expand if tag.locals.related_pages.empty?
   end
 
   desc %{ Sets the scope to the first related page. }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radiant-relations-extension
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2019-06-24 00:00:00.000000000 Z
 dependencies: []
 description: Allows you to define relations between pages
 email:
@@ -43,11 +43,12 @@ files:
 - app/views/admin/pages/_relations_header_load.html.haml
 - app/models/relation_page_part.rb
 - app/helpers/relations_helper.rb
+- radiant-relations-extension-1.2.5.gem
 - radiant-relations-extension-1.2.3.gem
 homepage: http://github.com/jomz/radiant-relations-extension
 licenses: []
 post_install_message: ! "\n    Add this to your radiant project by putting this line
-  in your Gemfile:\n      gem \"radiant-relations-extension\", \"~> 1.2.5\"\n  "
+  in your Gemfile:\n      gem \"radiant-relations-extension\", \"~> 1.2.6\"\n  "
 rdoc_options: []
 require_paths:
 - lib