Changeset 40297

Timestamp:

03/17/2017 04:53:08 PM (8 years ago)

Author:

swissspidy

Message:

List Tables: Hide 'Empty Trash' and 'Empty Spam' buttons when view is already empty.

Props ivantedja, Presskopp, printsachen1, Jaydeep Rami, mathieuhays, cazm.
Fixes #38341.

Location:

trunk

Files:

• src/wp-admin/includes/class-wp-comments-list-table.php (modified) (1 diff)
• src/wp-admin/includes/class-wp-media-list-table.php (modified) (1 diff)
• src/wp-admin/includes/class-wp-posts-list-table.php (modified) (1 diff)
• src/wp-admin/js/edit-comments.js (modified) (1 diff)
• tests/phpunit/tests/admin/includesListTable.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-comments-list-table.php

@@ -355 +355 @@
         }
 
-        if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_user_can( 'moderate_comments' ) ) {
+        if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_user_can( 'moderate_comments' ) && $this->has_items() ) {
             wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
             $title = ( 'spam' === $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );

trunk/src/wp-admin/includes/class-wp-media-list-table.php

@@ -178 +178 @@
         }
 
-        if ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) {
+        if ( $this->is_trash && current_user_can( 'edit_others_posts' ) && $this->has_items() ) {
             submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
         } ?>

trunk/src/wp-admin/includes/class-wp-posts-list-table.php

@@ -490 +490 @@
         }
 
-        if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) ) {
+        if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) && $this->has_items() ) {
             submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
         }

trunk/src/wp-admin/js/edit-comments.js

@@ -460 +460 @@
         if ( trashDiff ) {
             updateCountText( 'span.trash-count', trashDiff );
+        }
+
+        if (
+            ( ( 'trash' === settings.data.comment_status ) && !getCount( $( 'span.trash-count' ) ) ) ||
+            ( ( 'spam' === settings.data.comment_status ) && !getCount( $( 'span.spam-count' ) ) )
+        ) {
+            $( '#delete_all' ).hide();
         }
 

trunk/tests/phpunit/tests/admin/includesListTable.php

@@ -236 +236 @@
         $this->assertNotContains( 'id="cat"', $output );
     }
+
+    /**
+     * @ticket 38341
+     */
+    public function test_empty_trash_button_should_not_be_shown_if_there_are_no_posts() {
+        // Set post type to a non-existent one.
+        $this->table->screen->post_type = 'foo';
+
+        ob_start();
+        $this->table->extra_tablenav( 'top' );
+        $output = ob_get_clean();
+
+        $this->assertNotContains( 'id="delete_all"', $output );
+    }
+
+    /**
+     * @ticket 38341
+     */
+    public function test_empty_trash_button_should_not_be_shown_if_there_are_no_comments() {
+        $table = _get_list_table( 'WP_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
+
+        ob_start();
+        $table->extra_tablenav( 'top' );
+        $output = ob_get_clean();
+
+        $this->assertNotContains( 'id="delete_all"', $output );
+    }
 }