fix leaf view

[pettanr/pettanr.git] / lib / locmare / list_group / list / play.rb

diff --git a/lib/locmare/list_group/list/play.rb b/lib/locmare/list_group/list/play.rb
index 3912b03..97d0028 100644 (file)
--- a/lib/locmare/list_group/list/play.rb
+++ b/lib/locmare/list_group/list/play.rb
@@ -43,11 +43,19 @@ module Locmare
       
       def open operators, options
         count = self.count operators, options
-        offset = self.offset count, options[:offset]
-        limit = self.limit options[:count]
-        items = self.items operators, options, offset, limit
+        if options[:offset]
+          offset = self.offset count, options[:offset]
+          page_size = self.limit options[:count]
+          pg = nil
+        else
+          page = self.page_number(options[:page]) 
+          page_size = self.page_size options[:page_size]
+          offset = (page -1) * page_size
+          pg = self.paginate count, page, page_size
+        end
+        items = self.items operators, options, offset, page_size
         self.boost items
-        ListResult.new self, items, nil, operators, options
+        ListResult.new self, items, count, pg, operators, options
       end
       
     end