Changeset 44628

Timestamp:

01/16/2019 05:51:56 PM (8 years ago)

Author:

desrosj

Message:

Privacy: Allow column sorting in the privacy request admin tables.

This allows users to sort the export and erase personal data request tables by “Requester” (post_title, or user email) and “Requested” (post_date, or when the request was created), which can be helpful when sites have many requests present.

Props birgire, ianbelanger, pbiron, desrosj.
Fixes #43405.

Location:

trunk

Files:

• src/wp-admin/includes/user.php (modified) (5 diffs)
• tests/phpunit/tests/admin/wpPrivacyRequestsTable.php (added)

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

@@ -810 +810 @@
                         'plural'   => 'privacy_requests',
                         'singular' => 'privacy_request',
+                        'screen'   => 'export_personal_data',
                 )
         );
@@ -883 +884 @@
                         'plural'   => 'privacy_requests',
                         'singular' => 'privacy_request',
+                        'screen'   => 'remove_personal_data',
                 )
         );
@@ -1091 +1093 @@
          */
         protected function get_sortable_columns() {
-                return array();
+                // The initial sorting is by 'Requested' (post_date) and descending.
+                // With initial sorting, the first click on 'Requested' should be ascending.
+                // With 'Requester' sorting active, the next click on 'Requested' should be descending.
+                $desc_first = isset( $_GET['orderby'] );
+
+                return array(
+                        'email'             => 'requester',
+                        'created_timestamp' => array( 'requested', $desc_first ),
+                );
         }
 
@@ -1236 +1246 @@
          *
          * @since 4.9.6
+         * @since 5.1.0 Added support for column sorting.
          */
         public function prepare_items() {
                 global $wpdb;
-
-                $primary               = $this->get_primary_column_name();
-                $this->_column_headers = array(
-                        $this->get_columns(),
-                        array(),
-                        $this->get_sortable_columns(),
-                        $primary,
-                );
 
                 $this->items    = array();
@@ -1258 +1261 @@
                         's'              => isset( $_REQUEST['s'] ) ? sanitize_text_field( $_REQUEST['s'] ) : '',
                 );
+
+                $orderby_mapping = array(
+                        'requester' => 'post_title',
+                        'requested' => 'post_date',
+                );
+
+                if ( isset( $_REQUEST['orderby'] ) && isset( $orderby_mapping[ $_REQUEST['orderby'] ] ) ) {
+                        $args['orderby'] = $orderby_mapping[ $_REQUEST['orderby'] ];
+                }
+
+                if ( isset( $_REQUEST['order'] ) && in_array( strtoupper( $_REQUEST['order'] ), array( 'ASC', 'DESC' ), true ) ) {
+                        $args['order'] = strtoupper( $_REQUEST['order'] );
+                }
 
                 if ( ! empty( $_REQUEST['filter-status'] ) ) {