Changeset 62074

Timestamp:

03/20/2026 03:13:44 PM (6 months ago)

Author:

ellatrix

Message:

Real-time collaboration: Remove post list lock icon and replace user-specific lock text when RTC is enabled.

When RTC is enabled, the post list should not show an exclusive lock icon or user-specific lock text since multiple users can collaboratively edit the same post.

Merges a fix from Gutenberg: ​https://github.com/WordPress/gutenberg/pull/76322.

Developed in: ​https://github.com/WordPress/wordpress-develop/pull/11234.

See #64622.
Props maxschmeling, czarate, mcsf, shekharnwagh.

Location:

trunk/src

Files:

• js/_enqueues/admin/inline-edit-post.js (modified) (3 diffs)
• wp-admin/css/list-tables.css (modified) (1 diff)
• wp-admin/includes/class-wp-posts-list-table.php (modified) (3 diffs)
• wp-admin/includes/misc.php (modified) (2 diffs)

trunk/src/js/_enqueues/admin/inline-edit-post.js

@@ -614 +614 @@
         }
 }).on( 'heartbeat-tick.wp-check-locked-posts', function( e, data ) {
-        var locked = data['wp-check-locked-posts'] || {};
+        var locked = data['wp-check-locked-posts'] || {},
+                isRtc = window._wpCollaborationEnabled,
+                lockedClass = isRtc ? 'wp-collaborative-editing' : 'wp-locked';
 
         $('#the-list tr').each( function(i, el) {
@@ -620 +622 @@
 
                 if ( locked.hasOwnProperty( key ) ) {
-                        if ( ! row.hasClass('wp-locked') ) {
+                        if ( ! row.hasClass( lockedClass ) ) {
                                 lock_data = locked[key];
                                 row.find('.column-title .locked-text').text( lock_data.text );
                                 row.find('.check-column checkbox').prop('checked', false);
 
-                                if ( lock_data.avatar_src ) {
+                                if ( ! isRtc && lock_data.avatar_src ) {
                                         avatar = $( '<img />', {
                                                 'class': 'avatar avatar-18 photo',
@@ -636 +638 @@
                                         row.find('.column-title .locked-avatar').empty().append( avatar );
                                 }
-                                row.addClass('wp-locked');
-                        }
-                } else if ( row.hasClass('wp-locked') ) {
-                        row.removeClass( 'wp-locked' ).find( '.locked-info span' ).empty();
+                                row.addClass( lockedClass );
+                        }
+                } else if ( row.hasClass( lockedClass ) ) {
+                        row.removeClass( lockedClass ).find( '.locked-info span' ).empty();
                 }
         });

trunk/src/wp-admin/css/list-tables.css

@@ -636 +636 @@
 }
 
+.wp-collaborative-editing .locked-info {
+        display: block;
+}
+
 #menu-locations-wrap .widefat {
         width: 60%;

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

@@ -1120 +1120 @@
 
                         if ( $lock_holder ) {
-                                $lock_holder   = get_userdata( $lock_holder );
-                                $locked_avatar = get_avatar( $lock_holder->ID, 18 );
-                                /* translators: %s: User's display name. */
-                                $locked_text = esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) );
+                                if ( get_option( 'wp_collaboration_enabled' ) ) {
+                                        $locked_avatar = '';
+                                        /* translators: Collaboration status message for a singular post in the post list. Can be any type of post. */
+                                        $locked_text   = esc_html_x( 'Currently being edited', 'post list' );
+                                } else {
+                                        $lock_holder   = get_userdata( $lock_holder );
+                                        $locked_avatar = get_avatar( $lock_holder->ID, 18 );
+                                        /* translators: %s: User's display name. */
+                                        $locked_text = esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) );
+                                }
                         } else {
                                 $locked_avatar = '';
@@ -1428 +1434 @@
 
                 if ( $lock_holder ) {
-                        $classes .= ' wp-locked';
+                        if ( get_option( 'wp_collaboration_enabled' ) ) {
+                                $classes .= ' wp-collaborative-editing';
+                        } else {
+                                $classes .= ' wp-locked';
+                        }
                 }
 
@@ -1482 +1492 @@
 
                 if ( $can_edit_post && 'trash' !== $post->post_status ) {
+                        $is_rtc_locked = get_option( 'wp_collaboration_enabled' ) && wp_check_post_lock( $post->ID );
+
                         $actions['edit'] = sprintf(
                                 '<a href="%s" aria-label="%s">%s</a>',
                                 get_edit_post_link( $post->ID ),
-                                /* translators: %s: Post title. */
-                                esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ),
-                                __( 'Edit' )
+                                esc_attr(
+                                        sprintf(
+                                                $is_rtc_locked
+                                                        /* translators: %s: Post title. */
+                                                        ? __( 'Join editing &#8220;%s&#8221;', 'post list' )
+                                                        /* translators: %s: Post title. */
+                                                        : __( 'Edit &#8220;%s&#8221;' ),
+                                                $title
+                                        )
+                                ),
+                                /* translators: Action link text for a singular post in the post list. Can be any type of post. */
+                                $is_rtc_locked ? _x( 'Join', 'post list' ) : __( 'Edit' )
                         );
 

trunk/src/wp-admin/includes/misc.php

@@ -1134 +1134 @@
  */
 function wp_check_locked_posts( $response, $data, $screen_id ) {
-        $checked = array();
+        $checked        = array();
+        $is_rtc_enabled = (bool) get_option( 'wp_collaboration_enabled' );
 
         if ( array_key_exists( 'wp-check-locked-posts', $data ) && is_array( $data['wp-check-locked-posts'] ) ) {
@@ -1150 +1151 @@
 
                                 if ( $user && current_user_can( 'edit_post', $post_id ) ) {
-                                        $send = array(
-                                                'name' => $user->display_name,
-                                                /* translators: %s: User's display name. */
-                                                'text' => sprintf( __( '%s is currently editing' ), $user->display_name ),
-                                        );
-
-                                        if ( get_option( 'show_avatars' ) ) {
-                                                $send['avatar_src']    = get_avatar_url( $user->ID, array( 'size' => 18 ) );
-                                                $send['avatar_src_2x'] = get_avatar_url( $user->ID, array( 'size' => 36 ) );
+                                        if ( $is_rtc_enabled ) {
+                                                $send = array(
+                                                        /* translators: Collaboration status message for a singular post in the post list. Can be any type of post. */
+                                                        'text'          => _x( 'Currently being edited', 'post list' ),
+                                                        'collaborative' => true,
+                                                );
+                                        } else {
+                                                $send = array(
+                                                        'name' => $user->display_name,
+                                                        /* translators: %s: User's display name. */
+                                                        'text' => sprintf( __( '%s is currently editing' ), $user->display_name ),
+                                                );
+
+                                                if ( get_option( 'show_avatars' ) ) {
+                                                        $send['avatar_src']    = get_avatar_url( $user->ID, array( 'size' => 18 ) );
+                                                        $send['avatar_src_2x'] = get_avatar_url( $user->ID, array( 'size' => 36 ) );
+                                                }
                                         }