<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13017] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin: Plugin Directory: Reviewer tools: Make the Reviewer column sortable.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/13017">13017</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/13017","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-12-06 04:28:05 +0000 (Wed, 06 Dec 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Plugin Directory: Reviewer tools: Make the Reviewer column sortable.
Fixes <a href="http://meta.trac.wordpress.org/ticket/7147">#7147</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclasscustomizationsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminlisttableclasspluginpostsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclasscustomizationsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php 2023-12-06 00:17:52 UTC (rev 13016)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php 2023-12-06 04:28:05 UTC (rev 13017)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,6 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private function __construct() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'dashboard_glance_items', array( $this, 'plugin_glance_items' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'query_vars', array( $this, 'query_vars' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'load-edit.php', array( $this, 'bulk_action_plugins' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,6 +190,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filter the query vars used in wp-admin.
+ */
+ public function query_vars( $query_vars ) {
+ $query_vars[] = 'reviewer';
+
+ return $query_vars;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Filter the query in wp-admin to list only plugins relevant to the current user.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param \WP_Query $query
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,16 +224,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Filter by reviewer.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $_REQUEST['reviewer'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $query->query['reviewer'] ) && strlen( $query->query['reviewer'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta_query = $query->get( 'meta_query' ) ?: [];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta_query[] = [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta_query['assigned_reviewer'] = [
</ins><span class="cx" style="display: block; padding: 0 10px"> 'key' => 'assigned_reviewer',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'value' => intval( $_GET['reviewer'] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'value' => intval( $query->query['reviewer'] ),
+ 'type' => 'unsigned',
</ins><span class="cx" style="display: block; padding: 0 10px"> ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Query for no assignee.
+ if ( ! $meta_query['assigned_reviewer']['value'] ) {
+ $meta_query['assigned_reviewer']['compare'] = 'NOT EXISTS';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $query->set( 'meta_query', $meta_query );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'assigned_reviewer_time' === $query->query['orderby'] ?? '' ) {
+ $meta_query = $query->get( 'meta_query' ) ?: [];
+
+ $meta_query['assigned_reviewer_time'] = [
+ 'key' => 'assigned_reviewer_time',
+ 'type' => 'unsigned',
+ ];
+
+ $query->set( 'meta_query', $meta_query );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminlisttableclasspluginpostsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.php 2023-12-06 00:17:52 UTC (rev 13016)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.php 2023-12-06 04:28:05 UTC (rev 13017)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,51 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> class Plugin_Posts extends \WP_Posts_List_Table {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $column_order = [
+ 'cb',
+ 'title',
+ 'author',
+ 'reviewer',
+ 'comments',
+ ];
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Engage the filters.
+ */
+ public function __construct() {
+ parent::__construct();
+
+ add_filter( "manage_{$this->screen->post_type}_posts_columns", [ $this, 'filter_columns' ], 100 );
+ add_filter( "manage_{$this->screen->id}_sortable_columns", [ $this, 'filter_sortable_columns' ], 100 );
+ }
+
+ /**
+ * Add the custom columns and set the order.
+ */
+ public function filter_columns( $columns ) {
+ // Rename some columns.
+ $columns['author'] = __( 'Submitter', 'wporg-plugins' );
+ $columns['reviewer'] = __( 'Assigned Reviewer', 'wporg-plugins' );
+ $columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Internal Notes', 'wporg-plugins' ) . '"><span class="screen-reader-text">' . __( 'Internal Notes', 'wporg-plugins' ) . '</span></span>';
+
+ // We don't want the stats column.
+ unset( $columns['stats'] );
+
+ $columns = array_merge( array_flip( $this->column_order ), $columns );
+
+ return $columns;
+ }
+
+ /**
+ * The sortable columns.
+ */
+ public function filter_sortable_columns( $columns ) {
+ $columns[ 'reviewer' ] = [ 'assigned_reviewer_time', 'asc' ];
+
+ return $columns;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $avail_post_stati
</span><span class="cx" style="display: block; padding: 0 10px"> * @global \WP_Query $wp_query
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,51 +146,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * @return array
- */
- public function get_columns() {
- $post_type = $this->screen->post_type;
- $posts_columns = array(
- 'cb' => '<input type="checkbox" />',
- /* translators: manage posts column name */
- 'title' => _x( 'Title', 'column name', 'wporg-plugins' ),
- 'author' => __( 'Submitter', 'wporg-plugins' ),
- 'reviewer' => __( 'Assigned Reviewer', 'wporg-plugins' ),
- );
-
- $taxonomies = get_object_taxonomies( $post_type, 'objects' );
- $taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true ), 'and', 'name' );
- $taxonomies = apply_filters( "manage_taxonomies_for_{$post_type}_columns", $taxonomies, $post_type );
- $taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
-
- foreach ( $taxonomies as $taxonomy ) {
- $column_key = 'taxonomy-' . $taxonomy;
- $posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
- }
-
- $posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Internal Notes', 'wporg-plugins' ) . '"><span class="screen-reader-text">' . __( 'Internal Notes', 'wporg-plugins' ) . '</span></span>';
- $posts_columns['date'] = __( 'Date', 'wporg-plugins' );
-
- /**
- * Filter the columns displayed in the Plugins list table.
- *
- * @param array $posts_columns An array of column names.
- * @param string $post_type The post type slug.
- */
- $posts_columns = apply_filters( 'manage_posts_columns', $posts_columns, $post_type );
-
- /**
- * Filter the columns displayed in the Plugins list table.
- *
- * The dynamic portion of the hook name, `$post_type`, refers to the post type slug.
- *
- * @param array $post_columns An array of column names.
- */
- return apply_filters( "manage_{$post_type}_posts_columns", $posts_columns );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * @global \WP_Post $post
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|\WP_Post $post
</span></span></pre>
</div>
</div>
</body>
</html>