Changeset 2927

Timestamp:

04/11/2016 11:33:19 AM (9 years ago)

Author:

obenland

Message:

Plugin Directory: Make sure pagination in plugin list works.

See #1570.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin

Files:

• class-customizations.php (modified) (3 diffs)
• list-table/class-plugin-posts.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php

@@ -137 +137 @@
         }
 
+        if ( empty( $query->query['post_status'] ) ) {
+            $query->query_vars['post_status'] = array( 'publish', 'future', 'draft', 'pending', 'disabled', 'closed', 'rejected' );
+        }
+
         if ( ! current_user_can( 'plugin_edit_others' ) || ( isset( $query->query['author'] ) && $query->query['author'] == get_current_user_id() ) ) {
             $query->query_vars['author'] = get_current_user_id();
+
             $plugins = Tools::get_users_write_access_plugins( get_current_user_id() );
-
             if ( $plugins ) {
                 $query->query_vars['post_name__in'] = $plugins;
@@ -165 +169 @@
 
         // Allow reviewers to also see all pending plugins.
-        if ( current_user_can( 'plugin_edit_pending' ) && ! isset( $_GET['author'] ) ) {
+        if ( current_user_can( 'plugin_edit_pending' ) && ( ! isset( $_GET['author'] ) || ( isset( $_GET['post_status'] ) && 'pending' === $_GET['post_status'] ) ) ) {
             $where .= " OR {$wpdb->posts}.post_status = 'pending'";
         }
@@ -183 +187 @@
         if ( 'plugin' === $post_type ) {
             $wp_list_table = new Plugin_Posts();
+            $wp_list_table->prepare_items();
         }
     }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.php

@@ -13 +13 @@
      */
      protected $plugin_meta;
+
+    /**
+     *
+     * @global array    $avail_post_stati
+     * @global WP_Query $wp_query
+     * @global int      $per_page
+     * @global string   $mode
+     */
+    public function prepare_items() {
+        global $avail_post_stati, $wp_query, $per_page, $mode;
+
+        $this->set_hierarchical_display( is_post_type_hierarchical( $this->screen->post_type ) && 'menu_order title' === $wp_query->query['orderby'] );
+
+        $post_type = $this->screen->post_type;
+        $per_page = $this->get_items_per_page( 'edit_' . $post_type . '_per_page' );
+
+        /** This filter is documented in wp-admin/includes/post.php */
+        $per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
+
+        if ( $this->hierarchical_display ) {
+            $total_items = $wp_query->post_count;
+        } elseif ( $wp_query->found_posts || $this->get_pagenum() === 1 ) {
+            $total_items = $wp_query->found_posts;
+        } else {
+            $post_counts = (array) wp_count_posts( $post_type, 'readable' );
+
+            if ( isset( $_REQUEST['post_status'] ) && in_array( $_REQUEST['post_status'] , $avail_post_stati ) ) {
+                $total_items = $post_counts[ $_REQUEST['post_status'] ];
+            } elseif ( isset( $_REQUEST['show_sticky'] ) && $_REQUEST['show_sticky'] ) {
+                $total_items = $this->sticky_posts_count;
+            } elseif ( isset( $_GET['author'] ) && $_GET['author'] == get_current_user_id() ) {
+                $total_items = $this->user_posts_count;
+            } else {
+                $total_items = array_sum( $post_counts );
+
+                // Subtract post types that are not included in the admin all list.
+                foreach ( get_post_stati( array( 'show_in_admin_all_list' => false ) ) as $state ) {
+                    $total_items -= $post_counts[ $state ];
+                }
+            }
+        }
+
+        if ( ! empty( $_REQUEST['mode'] ) ) {
+            $mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
+            set_user_setting( 'posts_list_mode', $mode );
+        } else {
+            $mode = get_user_setting( 'posts_list_mode', 'list' );
+        }
+
+        $this->is_trash = isset( $_REQUEST['post_status'] ) && $_REQUEST['post_status'] === 'trash';
+
+        $this->set_pagination_args( array(
+            'total_items' => $total_items,
+            'per_page' => $per_page
+        ) );
+    }
 
     /**