Changeset 39138

Timestamp:

11/04/2016 07:23:49 AM (8 years ago)

Author:

westonruter

Message:

Customize: Ensure page/post stubs are included in listings and searches for available nav menu items.

Include the customized state in the Ajax requests to load items and search items.

See #38573.
Fixes #38122.

Location:

trunk

Files:

• src/wp-admin/js/customize-nav-menus.js (modified) (3 diffs)
• src/wp-includes/class-wp-customize-nav-menus.php (modified) (3 diffs)
• tests/phpunit/tests/ajax/CustomizeMenus.php (modified) (5 diffs)

trunk/src/wp-admin/js/customize-nav-menus.js

@@ -303 +303 @@
             $section.addClass( 'loading' );
             self.loading = true;
-            params = {
+
+            params = api.previewer.query( { excludeCustomizedSaved: true } );
+            _.extend( params, {
                 'customize-menus-nonce': api.settings.nonce['customize-menus'],
                 'wp_customize': 'on',
                 'search': self.searchTerm,
                 'page': page
-            };
+            } );
 
             self.currentRequest = wp.ajax.post( 'search-available-menu-items-customizer', params );
@@ -379 +381 @@
          */
         loadItems: function( itemTypes, deprecated ) {
-            var self = this, _itemTypes, requestItemTypes = [], request, itemTemplate, availableMenuItemContainers = {};
+            var self = this, _itemTypes, requestItemTypes = [], params, request, itemTemplate, availableMenuItemContainers = {};
             itemTemplate = wp.template( 'available-menu-item' );
 
@@ -409 +411 @@
 
             self.loading = true;
-            request = wp.ajax.post( 'load-available-menu-items-customizer', {
+
+            params = api.previewer.query( { excludeCustomizedSaved: true } );
+            _.extend( params, {
                 'customize-menus-nonce': api.settings.nonce['customize-menus'],
                 'wp_customize': 'on',
                 'item_types': requestItemTypes
             } );
+
+            request = wp.ajax.post( 'load-available-menu-items-customizer', params );
 
             request.done(function( data ) {

trunk/src/wp-includes/class-wp-customize-nav-menus.php

@@ -175 +175 @@
             }
 
-            $posts = get_posts( array(
+            // Prepend posts with nav_menus_created_posts on first page.
+            $posts = array();
+            if ( 0 === $page && $this->manager->get_setting( 'nav_menus_created_posts' ) ) {
+                foreach ( $this->manager->get_setting( 'nav_menus_created_posts' )->value() as $post_id ) {
+                    $auto_draft_post = get_post( $post_id );
+                    if ( $post_type->name === $auto_draft_post->post_type ) {
+                        $posts[] = $auto_draft_post;
+                    }
+                }
+            }
+
+            $posts = array_merge( $posts, get_posts( array(
                 'numberposts' => 10,
                 'offset'      => 10 * $page,
@@ -181 +192 @@
                 'order'       => 'DESC',
                 'post_type'   => $object,
-            ) );
+            ) ) );
+
             foreach ( $posts as $post ) {
                 $post_title = $post->post_title;
@@ -306 +318 @@
         }
 
+        $posts = array();
+
+        // Prepend list of posts with nav_menus_created_posts search results on first page.
+        $nav_menus_created_posts_setting = $this->manager->get_setting( 'nav_menus_created_posts' );
+        if ( 1 === $args['pagenum'] && $nav_menus_created_posts_setting && count( $nav_menus_created_posts_setting ) > 0 ) {
+            $stub_post_query = new WP_Query( array_merge(
+                $query,
+                array(
+                    'post_status' => 'auto-draft',
+                    'post__in' => $nav_menus_created_posts_setting->value(),
+                    'posts_per_page' => -1,
+                )
+            ) );
+            $posts = array_merge( $posts, $stub_post_query->posts );
+        }
+
         // Query posts.
         $get_posts = new WP_Query( $query );
-
-        // Check if any posts were found.
-        if ( $get_posts->post_count ) {
-            foreach ( $get_posts->posts as $post ) {
-                $post_title = $post->post_title;
-                if ( '' === $post_title ) {
-                    /* translators: %d: ID of a post */
-                    $post_title = sprintf( __( '#%d (no title)' ), $post->ID );
-                }
-                $items[] = array(
-                    'id'         => 'post-' . $post->ID,
-                    'title'      => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
-                    'type'       => 'post_type',
-                    'type_label' => $post_type_objects[ $post->post_type ]->labels->singular_name,
-                    'object'     => $post->post_type,
-                    'object_id'  => intval( $post->ID ),
-                    'url'        => get_permalink( intval( $post->ID ) ),
-                );
-            }
+        $posts = array_merge( $posts, $get_posts->posts );
+
+        // Create items for posts.
+        foreach ( $posts as $post ) {
+            $post_title = $post->post_title;
+            if ( '' === $post_title ) {
+                /* translators: %d: ID of a post */
+                $post_title = sprintf( __( '#%d (no title)' ), $post->ID );
+            }
+            $items[] = array(
+                'id'         => 'post-' . $post->ID,
+                'title'      => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+                'type'       => 'post_type',
+                'type_label' => $post_type_objects[ $post->post_type ]->labels->singular_name,
+                'object'     => $post->post_type,
+                'object_id'  => intval( $post->ID ),
+                'url'        => get_permalink( intval( $post->ID ) ),
+            );
         }
 

trunk/tests/phpunit/tests/ajax/CustomizeMenus.php

@@ -323 +323 @@
      */
     function test2_ajax_load_available_items_structure( $post_args ) {
+        do_action( 'customize_register', $this->wp_customize );
 
         $expected_keys = array(
@@ -337 +338 @@
         self::factory()->term->create_many( 5 );
         self::factory()->post->create_many( 5, array( 'post_type' => 'page' ) );
+        $auto_draft_post = $this->wp_customize->nav_menus->insert_auto_draft_post( array( 'post_title' => 'Test Auto Draft', 'post_type' => 'post' ) );
+        $this->wp_customize->set_post_value( 'nav_menus_created_posts', array( $auto_draft_post->ID ) );
+        $this->wp_customize->get_setting( 'nav_menus_created_posts' )->preview();
 
         $_POST = array_merge( array(
@@ -372 +376 @@
                 }
             }
+        } elseif ( 'post' === $test_item['object'] ) {
+            $item_ids = wp_list_pluck( $response['data']['items']['post_type:post'], 'id' );
+            $this->assertContains( 'post-' . $auto_draft_post->ID, $item_ids );
         }
     }
@@ -498 +505 @@
      */
     function test_ajax_search_available_items_results( $post_args, $expected_results ) {
+        do_action( 'customize_register', $this->wp_customize );
 
         self::factory()->post->create_many( 5, array( 'post_title' => 'Test Post' ) );
+        $included_auto_draft_post = $this->wp_customize->nav_menus->insert_auto_draft_post( array( 'post_title' => 'Test Included Auto Draft', 'post_type' => 'post' ) );
+        $excluded_auto_draft_post = $this->wp_customize->nav_menus->insert_auto_draft_post( array( 'post_title' => 'Excluded Auto Draft', 'post_type' => 'post' ) );
+        $this->wp_customize->set_post_value( 'nav_menus_created_posts', array( $included_auto_draft_post->ID, $excluded_auto_draft_post->ID ) );
+        $this->wp_customize->get_setting( 'nav_menus_created_posts' )->preview();
 
         $_POST = array_merge( array(
@@ -512 +524 @@
         if ( isset( $post_args['search'] ) && 'test' === $post_args['search'] ) {
             $this->assertsame( true, $response['success'] );
-            $this->assertSame( 5, count( $response['data']['items'] ) );
+            $this->assertSame( 6, count( $response['data']['items'] ) );
+            $item_ids = wp_list_pluck( $response['data']['items'], 'id' );
+            $this->assertContains( 'post-' . $included_auto_draft_post->ID, $item_ids );
+            $this->assertNotContains( 'post-' . $excluded_auto_draft_post->ID, $item_ids );
         } else {
             $this->assertSame( $expected_results, $response );
         }
-
     }