? 0001-Fixed-description-value-of-access-and-cache.patch ? 0001-no-style-settings-for-unformatted.patch ? 330956-fix-theme-information ? 411566-taxonomy-menu-weirdness.patch ? 450346-exposed-filters-sometimes-hide.patch ? 511908-19.views_exposed_filter_double_escape.patch ? 535206-attachments-repeat-exposed-filters.patch ? 593910-off-by-one.patch ? 607952-check-plain-queries.patch ? 619884-grouping-incorrectly.patch ? 622602-fix-missing-order-by.patch ? 622608-attachment-inherit-pager.patch ? TODO.txt ? Views 3 TODO.txt ? api.txt ? book.txt ? clean-views-1-tables.patch ? contact-form.patch ? contact_link_access_2.patch ? doc ? fix-grouping-index-bug.patch ? grid-fix_3.patch ? jump-menu-styles.patch ? move-renders.patch ? netbeans ? node_language_handler.patch ? notice-fix.patch ? options[id] ? reorder-displays_5.patch ? sdboyer-relationship.patch ? test.php ? token ? views-363516-unique-identifiers.patch ? views-376284.patch ? views-408894.patch ? views-420850.patch ? views-535424.patch ? views-561892.patch ? views-580320.patch ? views-HEAD-table_preprocess_row_store.patch ? views-HEAD-table_preprocess_row_store.patch.1 ? views-counter_row_index.patch ? views-get-total-rows.patch ? views-hidden-options_0.patch ? views-language.patch ? views-remove_user_search.patch ? views-trim-fix.patch ? views-user-picture-sort.patch ? views-views-embed-view-access-554016-2.patch ? views2-bug-623580.patch ? views2-export-should-be-ltr.patch ? views_HEAD_defaulted_handler_validation.patch ? views_arg_taxo_depth.patch ? views_argument_empty_text_attachment.patch ? views_base_field.patch ? views_feed_preview.patch ? views_handler_filter_in_operator-fix.patch ? views_handler_filter_node_access.patch ? views_table_first_last_classes_0.patch ? handlers/views-489888.patch ? modules/search/views-view-row-search.tpl.php ? modules/user/views_handler_field_is_online.inc Index: plugins/views_plugin_display.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_display.inc,v retrieving revision 1.27.2.4 diff -u -p -r1.27.2.4 views_plugin_display.inc --- plugins/views_plugin_display.inc 6 Nov 2009 18:19:40 -0000 1.27.2.4 +++ plugins/views_plugin_display.inc 18 Nov 2009 03:16:46 -0000 @@ -120,6 +120,13 @@ class views_plugin_display extends views } /** + * Does the display render the pager if it has it enabled? + */ + function render_pager() { + return $this->use_pager(); + } + + /** * Does the display have a more link enabled? */ function use_more() { Index: plugins/views_plugin_display_attachment.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_display_attachment.inc,v retrieving revision 1.6 diff -u -p -r1.6 views_plugin_display_attachment.inc --- plugins/views_plugin_display_attachment.inc 26 Jun 2009 00:23:42 -0000 1.6 +++ plugins/views_plugin_display_attachment.inc 18 Nov 2009 03:16:46 -0000 @@ -21,6 +21,7 @@ class views_plugin_display_attachment ex $options['attachment_position'] = array('default' => 'before'); $options['inherit_arguments'] = array('default' => TRUE); $options['inherit_exposed_filters'] = array('default' => FALSE); + $options['inherit_pager'] = array('default' => FALSE); $options['displays'] = array('default' => array()); return $options; @@ -69,6 +70,12 @@ class views_plugin_display_attachment ex 'value' => $this->get_option('inherit_exposed_filters') ? t('Yes') : t('No'), ); + $options['inherit_pager'] = array( + 'category' => 'attachment', + 'title' => t('Inherit pager'), + 'value' => $this->get_option('inherit_pager') ? t('Yes') : t('No'), + ); + $options['attachment_position'] = array( 'category' => 'attachment', 'title' => t('Position'), @@ -123,6 +130,15 @@ class views_plugin_display_attachment ex '#default_value' => $this->get_option('inherit_exposed_filters'), ); break; + case 'inherit_pager': + $form['#title'] .= t('Inherit pager'); + $form['inherit_pager'] = array( + '#type' => 'checkbox', + '#title' => t('Inherit'), + '#description' => t('Should this display inherit its paging values from the parent display to which it is attached? Note that this will provide unexpected results if the number of items to display do not match.'), + '#default_value' => $this->get_option('inherit_pager'), + ); + break; case 'attachment_position': $form['#title'] .= t('Position'); $form['attachment_position'] = array( @@ -159,6 +175,7 @@ class views_plugin_display_attachment ex parent::options_submit($form, $form_state); switch ($form_state['section']) { case 'inherit_arguments': + case 'inherit_pager': case 'inherit_exposed_filters': case 'attachment_position': case 'displays': @@ -188,6 +205,11 @@ class views_plugin_display_attachment ex $args = $this->get_option('inherit_arguments') ? $this->view->args : array(); $view->set_arguments($args); + $view->set_display($this->display->id); + if ($this->get_option('inherit_pager')) { + $view->display_handler->use_pager = $this->view->display[$display_id]->handler->use_pager(); + $view->display_handler->set_option('pager_element', $this->view->display[$display_id]->handler->get_option('pager_element')); + } // because of this, it is very very important that displays that can accept // attachments not also be attachments, or this could explode messily. @@ -229,4 +251,12 @@ class views_plugin_display_attachment ex function displays_exposed() { return $this->options['inherit_exposed_filters'] ? FALSE : TRUE; } + + function use_pager() { + return !empty($this->use_pager); + } + + function render_pager() { + return FALSE; + } } Index: theme/theme.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/theme/theme.inc,v retrieving revision 1.84.2.2 diff -u -p -r1.84.2.2 theme.inc --- theme/theme.inc 23 Oct 2009 21:37:49 -0000 1.84.2.2 +++ theme/theme.inc 18 Nov 2009 03:16:46 -0000 @@ -79,7 +79,7 @@ function template_preprocess_views_view( $vars['pager'] = ''; $exposed_input = isset($view->exposed_data_raw) ? $view->exposed_data_raw : NULL; - if (!empty($view->pager['use_pager'])) { + if ($view->display_handler->render_pager()) { $pager_type = ($view->pager['use_pager'] === 'mini' ? 'views_mini_pager' : 'pager'); $pager_theme = views_theme_functions($pager_type, $view, $view->display_handler->display); $vars['pager'] = theme($pager_theme, $exposed_input, $view->pager['items_per_page'], $view->pager['element']);