Index: webform_report.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/webform_report/Attic/webform_report.inc,v retrieving revision 1.1.2.26 diff -u -r1.1.2.26 webform_report.inc --- webform_report.inc 29 Mar 2010 17:21:03 -0000 1.1.2.26 +++ webform_report.inc 17 May 2010 03:10:56 -0000 @@ -430,17 +430,20 @@ global $pager_page_array, $pager_total; // For backward compatibility to earlier versions. - if (!$node->results_per_page) { - $results_per_page = 20; - } - else { + $results_per_page = 20; + if (!$node->results_per_page || $node->results_per_page == 0) { $results_per_page = $node->results_per_page; } // Add the css file for form display. drupal_add_css(drupal_get_path('module', 'webform_report') . '/webform_report.css'); // Break the array into chunks for pagination. - $pages = array_chunk($values, $results_per_page, TRUE); + if ($results_per_page) { + $pages = array_chunk($values, $results_per_page, TRUE); + } + else { + $pages[0] = $values; + } // Grab the 'page' query parameter. // Taken from pager_query() in pager.inc Index: webform_report.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/webform_report/webform_report.module,v retrieving revision 1.2.2.55.2.42 diff -u -r1.2.2.55.2.42 webform_report.module --- webform_report.module 29 Mar 2010 17:21:03 -0000 1.2.2.55.2.42 +++ webform_report.module 19 May 2010 01:37:28 -0000 @@ -350,7 +350,7 @@ $meta_components = array(-1 => t('User'), -2 => t('Date'), -3 => t('Time'), -4 => t('IP Address')); $filter_options = array(0 => t('none'), 1 => t('begins with'), 2 => t('does not begin with'), 3 => t('contains'), 4 => t('does not contain'), 5 => t('equals'), 6 => t('does not equal'), 7 => t('is empty'), 8 => t('is not empty')); $sort_options = array(SORT_ASC => t('Ascending'), SORT_DESC => t('Descending')); - $results_per_page_options = array(20 => '20', 40 => '40', 60 => '60', 80 => '80', 100 => '100'); + $results_per_page_options = array(0 => 'All', 20 => '20', 40 => '40', 60 => '60', 80 => '80', 100 => '100'); if (!empty($node->wnid)) { $default = $node->wnid; @@ -442,7 +442,7 @@ unset($default); if (!empty($node->kcid)) { - if (!empty($node->results_per_page)) { + if (arg(2) != 'add' && (!empty($node->results_per_page) || $node->results_per_page==0)) { $default = $node->results_per_page; } else {