wice_grid 3.2.1.pre2 → 3.2.1.pre3

data/README.rdoc

@@ -1,6 +1,6 @@
 = WiceGrid
 
-Version:: 3.2.1.pre2
+Version:: 3.2.1.pre3
 Author::  Yuri Leikind
 Sources:: https://github.com/leikind/wice_grid/
 Examples online:: http://grid.leikind.org

data/VERSION

@@ -1 +1 @@
-3.2.1.pre2
+3.2.1.pre3

data/lib/helpers/wice_grid_view_helpers.rb

@@ -461,14 +461,14 @@ module Wice
       grid.output_buffer << '</div>'
 
       if Rails.env == 'development'
-        grid.output_buffer  <<  javascript_tag(%/ $(document).ready(function(){ \n/ +
+        grid.output_buffer  <<  javascript_tag(%/ window.onload = function(){ \n/ +
           %$ if (typeof(WiceGridProcessor) == "undefined"){\n$ +
           %$   alert("wice_grid.js not loaded, WiceGrid cannot proceed!\\n" +\n$ +
           %$     "Make sure that you have loaded wice_grid.js.\\n" +\n$ +
           %$     "Add line\\n//= require wice_grid.js\\n" +\n$ +
           %$     "to app/assets/javascripts/application.js")\n$ +
           %$ }\n$ +
-          %$ }) $)
+          %$ } $)
       end
 
       grid.output_buffer
@@ -623,20 +623,42 @@ module Wice
 
       collection = grid.resultset
 
-      collection_total_entries = collection.total_count
+      if grid.all_record_mode?
+
+        collection_total_entries = collection.size
+        current_page = 1
+        per_page = collection_total_entries
+
+        first = 1
+        last = collection.size
+
+        num_pages = 1
+
+        class << collection
+          def current_page
+            1
+          end
 
+          def total_pages
+            1
+          end
+        end
 
-      current_page = grid.ar_options[:page].to_i
-      per_page = grid.ar_options[:per_page].to_i
+      else
+        collection_total_entries = collection.total_count
+        current_page = grid.ar_options[:page].to_i
+        per_page = grid.ar_options[:per_page].to_i
 
-      first = collection.offset_value + 1
-      last = collection.last_page? ? collection.total_count : collection.offset_value + collection.limit_value
+        first = collection.offset_value + 1
+        last = collection.last_page? ? collection.total_count : collection.offset_value + collection.limit_value
 
+        num_pages = collection.num_pages
+      end
 
       parameters = grid.get_state_as_parameter_value_pairs
 
       js = ''
-      html = if (collection.num_pages < 2 && collection.length == 0)
+      html = if (num_pages < 2 && collection.length == 0)
         '0'
       else
         parameters << ["#{grid.name}[pp]", collection_total_entries]

data/lib/wice_grid.rb

@@ -265,21 +265,16 @@ module Wice
         @ar_options[:order] += ' ' + @status[:order_direction]
       end
 
-      if self.output_html?
-        @ar_options[:per_page] = if all_record_mode?
-          # reset the :pp value in all records mode
-          @status[:pp] = count_resultset_without_paging_without_user_filters
-        else
-          @status[:per_page]
-        end
+      @ar_options[:joins]   = @options[:joins]
+      @ar_options[:include] = @options[:include]
+      @ar_options[:group]   = @options[:group]
 
+      if self.output_html?
+        @ar_options[:per_page] = @status[:per_page]
         @ar_options[:page] = @status[:page]
         @ar_options[:total_entries] = @status[:total_entries] if @status[:total_entries]
       end
 
-      @ar_options[:joins]   = @options[:joins]
-      @ar_options[:include] = @options[:include]
-      @ar_options[:group] = @options[:group]
     end
 
 
@@ -287,7 +282,7 @@ module Wice
     def read  #:nodoc:
       form_ar_options
       @klass.unscoped do
-        @resultset = if self.output_csv?
+        @resultset = if self.output_csv? || all_record_mode?
           # @relation.find(:all, @ar_options)
           @relation.
             includes(@ar_options[:include]).
@@ -538,17 +533,18 @@ module Wice
       end
     end
 
-    def count_resultset_without_paging_without_user_filters  #:nodoc:
-      form_ar_options
-      @klass.unscoped do
-        @relation.count(
-          :joins => @ar_options[:joins],
-          :include => @ar_options[:include],
-          :group => @ar_options[:group],
-          :conditions => @options[:conditions]
-        )
-      end
-    end
+    # not used right now
+    # def count_resultset_without_paging_without_user_filters  #:nodoc:
+    #   form_ar_options
+    #   @klass.unscoped do
+    #     @relation.count(
+    #       :joins => @ar_options[:joins],
+    #       :include => @ar_options[:include],
+    #       :group => @ar_options[:group],
+    #       :conditions => @options[:conditions]
+    #     )
+    #   end
+    # end
 
 
     def resultset_without_paging_with_user_filters  #:nodoc:

data/wice_grid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "wice_grid"
-  s.version = "3.2.1.pre2"
+  s.version = "3.2.1.pre3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yuri Leikind"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wice_grid
 version: !ruby/object:Gem::Version
-  version: 3.2.1.pre2
+  version: 3.2.1.pre3
   prerelease: 6
 platform: ruby
 authors: