Skip to content

Commit

Permalink
Jeckpack SSO return value for filter in User custom column (#37575)
Browse files Browse the repository at this point in the history
* Return existing value in the filter for Jetpack SSO Status custom column.

* Version bump and changelog
  • Loading branch information
darssen authored May 27, 2024
1 parent f8a8df3 commit 93a3e51
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fixed

SSO: Send User custom column back in the filter to not interfere with other custom columns.
2 changes: 1 addition & 1 deletion projects/packages/connection/src/class-package-version.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '2.8.4';
const PACKAGE_VERSION = '2.8.5-alpha';

const PACKAGE_SLUG = 'connection';

Expand Down
3 changes: 2 additions & 1 deletion projects/packages/connection/src/sso/class-user-admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function __construct() {
add_action( 'delete_user_form', array( $this, 'render_invitations_notices_for_deleted_users' ) );
add_action( 'delete_user', array( $this, 'revoke_user_invite' ) );
add_filter( 'manage_users_columns', array( $this, 'jetpack_user_connected_th' ) );
add_action( 'manage_users_custom_column', array( $this, 'jetpack_show_connection_status' ), 10, 3 );
add_filter( 'manage_users_custom_column', array( $this, 'jetpack_show_connection_status' ), 10, 3 );
add_action( 'user_row_actions', array( $this, 'jetpack_user_table_row_actions' ), 10, 2 );
add_action( 'admin_notices', array( $this, 'handle_invitation_results' ) );
add_action( 'admin_post_jetpack_invite_user_to_wpcom', array( $this, 'invite_user_to_wpcom' ) );
Expand Down Expand Up @@ -1221,6 +1221,7 @@ public function jetpack_show_connection_status( $val, $col, $user_id ) {
return $connection_html;
}
}
return $val;
}

/**
Expand Down

0 comments on commit 93a3e51

Please sign in to comment.