Changeset 38854

Timestamp:

10/21/2016 10:32:55 AM (8 years ago)

Author:

swissspidy

Message:

List Tables: Do not show filter button when there are no filter options available.

Props juhise, dipesh.kakadiya, swissspidy.
Fixes #37407.

Location:

trunk

Files:

• src/wp-admin/includes/class-wp-posts-list-table.php (modified) (3 diffs)
• tests/phpunit/tests/admin/includesListTable.php (modified) (2 diffs)

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

@@ -460 +460 @@
 <?php
         if ( 'top' === $which && !is_singular() ) {
+            ob_start();
 
             $this->months_dropdown( $this->screen->post_type );
@@ -480 +481 @@
             do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
 
-            submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+            $output = ob_get_clean();
+
+            if ( ! empty( $output ) ) {
+                echo $output;
+                submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+            }
         }
 
@@ -1553 +1559 @@
         <?php if ( current_user_can( $taxonomy->cap->assign_terms ) ) :
             $taxonomy_name = esc_attr( $taxonomy->name );
-    
+
             ?>
             <label class="inline-edit-tags">

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

@@ -9 +9 @@
     protected static $grandchildren = array();
     protected static $post_ids = array();
+
+    /**
+     * @var WP_Posts_List_Table
+     */
+    protected $table;
 
     function setUp() {
@@ -192 +197 @@
     }
 
+    /**
+     * @ticket 37407
+     */
+    function test_filter_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="post-query-submit"', $output );
+    }
+
+    /**
+     * @ticket 37407
+     */
+    function test_months_dropdown_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="filter-by-date"', $output );
+    }
+
+    /**
+     * @ticket 37407
+     */
+    function test_category_dropdown_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="cat"', $output );
+    }
 }