Skip to content

RTC: Remove post list lock icon and replace user-specific lock text when RTC is enabled #11234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
maxschmeling wants to merge 12 commits into from
+60 −24
Closed

RTC: Remove post list lock icon and replace user-specific lock text when RTC is enabled #11234

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6ad9a25
Post Locking: Replace exclusive lock UI with collaborative editing in…
maxschmeling Mar 12, 2026
2070346
Merge branch 'trunk' into backport/rtc-remove-post-lock-icon
maxschmeling Mar 19, 2026
7dffd5f
Merge branch 'trunk' into backport/rtc-remove-post-lock-icon
maxschmeling Mar 19, 2026
80e6f4c
Apply suggestions from code review
maxschmeling Mar 19, 2026
7210fe1
Merge branch 'trunk' into backport/rtc-remove-post-lock-icon
maxschmeling Mar 19, 2026
fb00824
Add translators notes and context
maxschmeling Mar 19, 2026
05dd126
Merge branch 'trunk' into backport/rtc-remove-post-lock-icon
maxschmeling Mar 19, 2026
8172d50
Use esc_html_x
maxschmeling Mar 19, 2026
daee10d
Simplify translator notes
maxschmeling Mar 20, 2026
10fdf61
Merge branch 'trunk' into backport/rtc-remove-post-lock-icon
maxschmeling Mar 20, 2026
0001f62
Fix formatting
maxschmeling Mar 20, 2026
4d8b23e
Remove whitespace at the end of a line
maxschmeling Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/js/_enqueues/admin/inline-edit-post.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,18 +613,20 @@ $( function() {
wp.heartbeat.interval( 10 );
}
}).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) {
var key = el.id, row = $(el), lock_data, avatar;

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',
width: 18,
Expand All @@ -635,10 +637,10 @@ $( function() {
} );
row.find('.column-title .locked-avatar').empty().append( avatar );
}
row.addClass('wp-locked');
row.addClass( lockedClass );
}
} else if ( row.hasClass('wp-locked') ) {
row.removeClass( 'wp-locked' ).find( '.locked-info span' ).empty();
} else if ( row.hasClass( lockedClass ) ) {
row.removeClass( lockedClass ).find( '.locked-info span' ).empty();
}
});
}).on( 'heartbeat-send.wp-check-locked-posts', function( e, data ) {
Expand Down
4 changes: 4 additions & 0 deletions src/wp-admin/css/list-tables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,10 @@ tr.wp-locked .row-actions .trash {
display: none;
}

.wp-collaborative-editing .locked-info {
display: block;
}

#menu-locations-wrap .widefat {
width: 60%;
}
Expand Down
25 changes: 18 additions & 7 deletions src/wp-admin/includes/class-wp-posts-list-table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1119,10 +1119,15 @@ public function column_title( $post ) {
$lock_holder = wp_check_post_lock( $post->ID );

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 = '';
$locked_text = esc_html__( 'Currently being edited' );
Comment thread
maxschmeling marked this conversation as resolved.
Outdated
} 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 = '';
$locked_text = '';
Expand Down Expand Up @@ -1427,7 +1432,11 @@ public function single_row( $post, $level = 0 ) {
$lock_holder = wp_check_post_lock( $post->ID );

if ( $lock_holder ) {
$classes .= ' wp-locked';
if ( get_option( 'wp_collaboration_enabled' ) ) {
$classes .= ' wp-collaborative-editing';
} else {
$classes .= ' wp-locked';
}
}

if ( $post->post_parent ) {
Expand Down Expand Up @@ -1481,12 +1490,14 @@ protected function handle_row_actions( $item, $column_name, $primary ) {
$title = _draft_or_post_title();

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 ? __( 'Join editing &#8220;%s&#8221;' ) : __( 'Edit &#8220;%s&#8221;' ), $title ) ),
Comment thread
maxschmeling marked this conversation as resolved.
Outdated
$is_rtc_locked ? __( 'Join' ) : __( 'Edit' )
Comment thread
maxschmeling marked this conversation as resolved.
Outdated
);

/**
Expand Down
28 changes: 18 additions & 10 deletions src/wp-admin/includes/misc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,7 +1133,8 @@ function _customizer_mobile_viewport_meta( $viewport_meta ) {
* @return array The Heartbeat response.
*/
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'] ) ) {
foreach ( $data['wp-check-locked-posts'] as $key ) {
Expand All @@ -1149,15 +1150,22 @@ function wp_check_locked_posts( $response, $data, $screen_id ) {
$user = get_userdata( $user_id );

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(
'text' => __( 'Currently being edited' ),
Comment thread
maxschmeling marked this conversation as resolved.
Outdated
'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 ) );
}
}

$checked[ $key ] = $send;
Expand Down
Loading