From 03ba132c14c37219032c443a0161a71555cad569 Mon Sep 17 00:00:00 2001 From: Eric Hogberg Date: Wed, 7 Sep 2011 22:42:14 -0500 Subject: [PATCH 1/4] Added Mongoid check & handling. --- app/views/layouts/application.datatables.jsonify | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/views/layouts/application.datatables.jsonify b/app/views/layouts/application.datatables.jsonify index 7e1ad81..53472a9 100644 --- a/app/views/layouts/application.datatables.jsonify +++ b/app/views/layouts/application.datatables.jsonify @@ -13,6 +13,12 @@ instance_variables.each do |vn| if v.class.name.start_with?("Array") and v.respond_to?('size') and (current_page_entries == 0) current_page_entries = v.size end + + # Mongoid... + if v.class.name.start_with?("Mongoid::Criteria") + total_entries = v.length + end + if v.respond_to?('total_entries') total_entries = v.total_entries current_page_entries = v.size From 79118aa7590b43a2bb11e793cb4f423e0f85c9c5 Mon Sep 17 00:00:00 2001 From: Eric Hogberg Date: Wed, 7 Sep 2011 23:45:24 -0500 Subject: [PATCH 2/4] Revert "Added Mongoid check & handling." This reverts commit 03ba132c14c37219032c443a0161a71555cad569. --- app/views/layouts/application.datatables.jsonify | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/views/layouts/application.datatables.jsonify b/app/views/layouts/application.datatables.jsonify index 53472a9..7e1ad81 100644 --- a/app/views/layouts/application.datatables.jsonify +++ b/app/views/layouts/application.datatables.jsonify @@ -13,12 +13,6 @@ instance_variables.each do |vn| if v.class.name.start_with?("Array") and v.respond_to?('size') and (current_page_entries == 0) current_page_entries = v.size end - - # Mongoid... - if v.class.name.start_with?("Mongoid::Criteria") - total_entries = v.length - end - if v.respond_to?('total_entries') total_entries = v.total_entries current_page_entries = v.size From 5447e9ed8baff3a6be6d0b434584b7a6e0021e64 Mon Sep 17 00:00:00 2001 From: Eric Hogberg Date: Wed, 7 Sep 2011 23:50:12 -0500 Subject: [PATCH 3/4] Added Mongoid::Criteria check of instance variables. --- app/views/layouts/application.datatables.jsonify | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/views/layouts/application.datatables.jsonify b/app/views/layouts/application.datatables.jsonify index 7e1ad81..71b98d4 100644 --- a/app/views/layouts/application.datatables.jsonify +++ b/app/views/layouts/application.datatables.jsonify @@ -13,6 +13,12 @@ instance_variables.each do |vn| if v.class.name.start_with?("Array") and v.respond_to?('size') and (current_page_entries == 0) current_page_entries = v.size end + + if v.class.name.start_with("Mongoid::Criteria") and v.respond_to?('length') + total_entries = v.length + break; + end + if v.respond_to?('total_entries') total_entries = v.total_entries current_page_entries = v.size From a7c74e5636735c5c21ecfe1c2430222e1aa58fb2 Mon Sep 17 00:00:00 2001 From: Eric Hogberg Date: Thu, 8 Sep 2011 14:13:28 -0500 Subject: [PATCH 4/4] Fixed typo on start_with? call --- app/views/layouts/application.datatables.jsonify | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.datatables.jsonify b/app/views/layouts/application.datatables.jsonify index 71b98d4..d1617ea 100644 --- a/app/views/layouts/application.datatables.jsonify +++ b/app/views/layouts/application.datatables.jsonify @@ -14,7 +14,7 @@ instance_variables.each do |vn| current_page_entries = v.size end - if v.class.name.start_with("Mongoid::Criteria") and v.respond_to?('length') + if v.class.name.start_with?("Mongoid::Criteria") total_entries = v.length break; end