Changeset 12570

Timestamp:

05/03/2023 11:33:44 PM (3 years ago)

Author:

adamwood

Message:

Learn: Sync with git WordPress/learn@83713e4

Location:

sites/trunk/wordpress.org/public_html/wp-content

Files:

• plugins/wporg-learn/inc/admin.php (modified) (7 diffs)
• plugins/wporg-learn/inc/post-meta.php (modified) (2 diffs)
• themes/pub/wporg-learn-2020/functions.php (modified) (1 diff)
• themes/pub/wporg-learn-2020/template-parts/component-lesson-filters.php (modified) (2 diffs)
• themes/pub/wporg-learn-2020/template-parts/component-workshop-filters.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/admin.php

@@ -6 +6 @@
 use function WordPressdotorg\Locales\get_locales_with_english_names;
 use function WordPressdotorg\Locales\get_locale_name_from_code;
-use function WPOrg_Learn\Post_Meta\get_available_workshop_locales;
+use function WPOrg_Learn\Post_Meta\get_available_post_type_locales;
 
 defined( 'WPINC' ) || die();
@@ -25 +25 @@
 }
 add_filter( 'manage_edit-wporg_workshop_sortable_columns', __NAMESPACE__ . '\add_workshop_list_table_sortable_columns' );
-add_action( 'restrict_manage_posts', __NAMESPACE__ . '\add_workshop_list_table_filters', 10, 2 );
-add_action( 'pre_get_posts', __NAMESPACE__ . '\handle_workshop_list_table_filters' );
+add_action( 'restrict_manage_posts', __NAMESPACE__ . '\add_admin_list_table_filters', 10, 2 );
+add_action( 'pre_get_posts', __NAMESPACE__ . '\handle_admin_list_table_filters' );
 add_filter( 'display_post_states', __NAMESPACE__ . '\add_post_states', 10, 2 );
 foreach ( array( 'lesson-plan', 'wporg_workshop', 'course', 'lesson' ) as $pt ) {
@@ -224 +224 @@
 
 /**
- * Add filtering controls for the workshops list table.
+ * Add filtering controls for the tutorial and lesson plan list tables.
  *
  * @param string $post_type
@@ -231 +231 @@
  * @return void
  */
-function add_workshop_list_table_filters( $post_type, $which ) {
-        if ( 'wporg_workshop' !== $post_type || 'top' !== $which ) {
-                return;
-        }
-
-        $available_locales = get_available_workshop_locales( 'language', 'english', false );
+function add_admin_list_table_filters( $post_type, $which ) {
+        if ( ( 'wporg_workshop' !== $post_type && 'lesson-plan' !== $post_type ) || 'top' !== $which ) {
+                return;
+        }
+
+        $post_status       = filter_input( INPUT_GET, 'post_status', FILTER_SANITIZE_STRING );
+        $available_locales = get_available_post_type_locales( 'language', $post_type, $post_status );
         $language          = filter_input( INPUT_GET, 'language', FILTER_SANITIZE_STRING );
 
@@ -261 +262 @@
 
 /**
- * Alter the query to include workshop list table filters.
+ * Alter the query to include tutorial and lesson plan list table filters.
  *
  * @param WP_Query $query
@@ -267 +268 @@
  * @return void
  */
-function handle_workshop_list_table_filters( WP_Query $query ) {
+function handle_admin_list_table_filters( WP_Query $query ) {
         if ( ! is_admin() || ! function_exists( 'get_current_screen' ) ) {
                 return;
@@ -278 +279 @@
         }
 
-        if ( 'edit-wporg_workshop' === $current_screen->id ) {
+        if ( 'edit-wporg_workshop' === $current_screen->id || 'edit-lesson-plan' === $current_screen->id ) {
                 $language = filter_input( INPUT_GET, 'language', FILTER_SANITIZE_STRING );
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/post-meta.php

@@ -258 +258 @@
 
 /**
- * Get a list of locales that are associated with at least one workshop.
- *
- * Optionally only published workshops.
+ * Get a list of locales that are associated with at least one post of the specified type.
  *
  * @param string $meta_key
+ * @param string $post_type
+ * @param string $post_status
  * @param string $label_language
- * @param bool   $published_only
  *
  * @return array
  */
-function get_available_workshop_locales( $meta_key, $label_language = 'english', $published_only = true ) {
+function get_available_post_type_locales( $meta_key, $post_type, $post_status, $label_language = 'english' ) {
         global $wpdb;
 
         $and_post_status = '';
-        if ( $published_only ) {
-                $and_post_status = "AND posts.post_status = 'publish'";
+        if ( in_array( $post_status, get_post_stati(), true ) ) {
+                $and_post_status = "AND posts.post_status = '$post_status'";
         }
 
         $results = $wpdb->get_col( $wpdb->prepare(
-                // phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- $and_post_status contains no user input.
+                // phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- $and_post_status only includes $post_status if it matches an allowed string.
                 "
-                        SELECT DISTINCT postmeta.meta_value
-                        FROM {$wpdb->postmeta} postmeta
-                                JOIN {$wpdb->posts} posts ON posts.ID = postmeta.post_id $and_post_status
-                        WHERE postmeta.meta_key = %s
-                ",
+                SELECT DISTINCT postmeta.meta_value
+                FROM {$wpdb->postmeta} postmeta
+                        JOIN {$wpdb->posts} posts ON posts.ID = postmeta.post_id AND posts.post_type = %s $and_post_status
+                WHERE postmeta.meta_key = %s
+        ",
+                $post_type,
                 $meta_key
                 // phpcs:enable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
@@ -346 +346 @@
         $download_url = filter_input( INPUT_POST, 'slides-download-url', FILTER_VALIDATE_URL ) ?: '';
         update_post_meta( $post_id, 'slides_download_url', $download_url );
+
+        // This language meta field is rendered in the editor sidebar using a PluginDocumentSettingPanel block,
+        // which won't save the field on publish if it has the default value.
+        // Our filtering by locale depends on it being set, so we force it to be updated after saving:
+        $language         = get_post_meta( $post_id, 'language', true );
+        $language_default = 'en_US';
+        if ( ! isset( $language ) || $language_default === $language ) {
+                update_post_meta( $post_id, 'language', $language_default );
+        }
 }
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/functions.php

@@ -708 +708 @@
 
                 case 'lesson-plan':
-                        $args['meta']  = wporg_learn_get_lesson_plan_taxonomy_data( $post_id, 'archive' );
+                        $args['meta'] = array_merge(
+                                wporg_learn_get_lesson_plan_taxonomy_data( $post_id, 'archive' ),
+                                array(
+                                        array(
+                                                'icon'  => 'admin-site-alt3',
+                                                'label' => __( 'Language:', 'wporg-learn' ),
+                                                'value' => \WordPressdotorg\Locales\get_locale_name_from_code( $post->language, 'native' ),
+                                        ),
+                                )
+                        );
                         break;
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-lesson-filters.php

@@ -32 +32 @@
         ),
 );
+
+$locales = \WPOrg_Learn\Post_Meta\get_available_post_type_locales( 'language', 'lesson-plan', 'publish', 'native' );
 ?>
 
@@ -41 +43 @@
                         <?php esc_html_e( 'Apply Filters', 'wporg-learn' ); ?>
                 </button>
-                <a href="<?php echo esc_url( get_post_type_archive_link( 'lesson-plan' ) ); ?>" class="clear-filters">
+                <a href="<?php echo esc_url( get_post_type_archive_link( 'lesson-plan' ) . '?_view=all' ); ?>" class="clear-filters">
                         <?php esc_html_e( 'Clear All Filters', 'wporg-learn' ); ?>
                 </a>
+        </div>
+
+        <h4 class="h5" id="lp-filters-language-heading"><?php esc_html_e( 'Language', 'wporg-learn' ); ?></h4>
+        <div class="filter-group">
+                <select
+                        id="<?php echo esc_attr( 'language' ); ?>"
+                        class="filter-group-select"
+                        name="<?php echo esc_attr( 'language' ); ?>"
+                        data-placeholder="<?php esc_attr_e( 'Select', 'wporg-learn' ); ?>"
+                        aria-labelledby="lp-filters-language-heading"
+                >
+                        <option value=""><?php esc_html_e( 'Select', 'wporg-learn' ); ?></option>
+                        <?php foreach ( $locales as $locale_value => $locale_label ) : ?>
+                                <option
+                                        value="<?php echo esc_attr( $locale_value ); ?>"
+                                        <?php selected( $locale_value, filter_input( INPUT_GET, 'language' ) ); ?>
+                                >
+                                        <?php printf( '%s [%s]', esc_html( $locale_label ), esc_html( $locale_value ) ); ?>
+                                </option>
+                        <?php endforeach; ?>
+                </select>
         </div>
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-workshop-filters.php

@@ -24 +24 @@
                 'label' => __( 'Language', 'wporg-learn' ),
                 'name'  => 'language',
-                'items' => \WPOrg_Learn\Post_Meta\get_available_workshop_locales( 'language', 'native' ),
+                'items' => \WPOrg_Learn\Post_Meta\get_available_post_type_locales( 'language', 'wporg_workshop', 'publish', 'native' ),
         ),
         array(
                 'label' => __( 'Subtitles', 'wporg-learn' ),
                 'name'  => 'captions',
-                'items' => \WPOrg_Learn\Post_Meta\get_available_workshop_locales( 'video_caption_language', 'native' ),
+                'items' => \WPOrg_Learn\Post_Meta\get_available_post_type_locales( 'video_caption_language', 'wporg_workshop', 'publish', 'native' ),
         ),
         array(