radiant-find_by_id_tag-extension 1.2.2 → 1.2.3

data/lib/find_by_id/tag_extensions.rb

@@ -1,6 +1,6 @@
 module FindById::TagExtensions
   include Radiant::Taggable
-  
+
   desc %{
     Inside this tag all page related tags refer to the page found at the @path@ attribute.
     @path@s may be relative or absolute paths.
@@ -28,9 +28,9 @@ module FindById::TagExtensions
     Aggregates the children of multiple paths using the @paths@ or @ids@ attribute.
     Useful for combining many different sections/categories into a single
     feed or listing.
-    
+
     *Usage*:
-    
+
     <pre><code><r:aggregate paths="/section1; /section2; /section3"> ... </r:aggregate>
     <r:aggregate ids="4; 6; 7"> ... </r:aggregate></code></pre>
   }
@@ -45,7 +45,7 @@ module FindById::TagExtensions
     end
     tag.expand
   end
-  
+
   desc %{
     Sets the scope to the individual aggregated page allowing you to
     iterate through each of the listed paths.
@@ -59,8 +59,12 @@ module FindById::TagExtensions
     # tag.locals.aggregated_pages = tag.locals.parent_ids.map {|p| Page.find(p)}
     # Make this tag accept 'order' params. Ideally this would go in Radiant's standard_tags.rb
     order = children_find_options(tag).delete(:order)
-    tag.locals.aggregated_pages = Page.find(tag.locals.parent_ids, :order => order)
-
+    # if no order param was set, keep the order in which the ids were given
+    if tag.attr['order'].nil?
+      tag.locals.aggregated_pages = tag.locals.parent_ids.map{|pid| Page.find pid}
+    else
+      tag.locals.aggregated_pages = Page.find(tag.locals.parent_ids, :order => order)
+    end
     tag.locals.aggregated_pages.each do |aggregate_page|
       tag.locals.page = aggregate_page
       aggregates << tag.expand

data/lib/radiant-find_by_id_tag-extension.rb

@@ -1,5 +1,5 @@
 module RadiantFindByIdTagExtension
-  VERSION     = "1.2.2"
+  VERSION     = "1.2.3"
   SUMMARY     = "Find By Id Tag for Radiant CMS"
   DESCRIPTION = "Adds support for an 'id' attribute to r:find"
   URL         = "http://github.com/jomz/radiant-find_by_id_tag-extension"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radiant-find_by_id_tag-extension
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-06-30 00:00:00.000000000 Z
 dependencies: []
 description: Adds support for an 'id' attribute to r:find
 email:
@@ -19,6 +19,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - radiant-find_by_id_tag-extension-1.0.0.gem
+- radiant-find_by_id_tag-extension-1.2.2.gem
 - cucumber.yml
 - find_by_id_tag_extension.rb
 - radiant-find_by_id_tag-extension-1.2.0.gem