Ticket #44266: 44266.diff

src/wp-admin/css/forms.css

@@ -1202 +1202 @@
         color: #72777c;
 }
 
+.privacy_requests .row-actions .remove-personal-data,
+.privacy_requests .row-actions .export-personal-data {
+        display: inline-block;
+}
+
 .privacy_requests tbody .has-request-results th {
         box-shadow: none;
 }

src/wp-admin/includes/class-wp-privacy-data-export-requests-list-table.php

@@ -63 +63 @@
 
                 $download_data_markup .= '</div>';
 
+                $resend_email_markup = '<span>';
+
+                        $resend_email_markup .= sprintf(
+                                '<a href="%s" class="resendemail" aria-label="%s">%s</a>',
+                                esc_url(
+                                        wp_nonce_url(
+                                                add_query_arg(
+                                                        array(
+                                                                'action'     => 'resend',
+                                                                'request_id' => array( $request_id ),
+                                                        ),
+                                                        admin_url( 'export-personal-data.php' )
+                                                ),
+                                                'bulk-privacy_requests'
+                                        )
+                                ),
+                                /* translators: %s: Taxonomy term name. */
+                                esc_attr( sprintf( __( 'Resend export request confirmation email to &#8220;%s&#8221; ' ), $item->email ) ),
+                                __( 'Resend Confirmation Email' )
+                        );
+
+                        $resend_email_markup .= '</span>';
+
+                $delete_request_markup = '<span class="trash">';
+
+                $delete_request_markup .= sprintf(
+                        '<a href="%s" class="deleterequest" aria-label="%s">%s</a>',
+                        esc_url(
+                                wp_nonce_url(
+                                        add_query_arg(
+                                                array(
+                                                        'action'     => 'delete',
+                                                        'request_id' => array( $request_id ),
+                                                ),
+                                                admin_url( 'export-personal-data.php' )
+                                        ),
+                                        'bulk-privacy_requests'
+                                )
+                        ),
+                        /* translators: %s: Taxonomy term name. */
+                        esc_attr( sprintf( __( 'Delete &#8220;%s&#8221; export request' ), $item->email ) ),
+                        __( 'Delete Request' )
+                );
+
+                $delete_request_markup .= '</span>';
+
                 $row_actions = array(
-                        'download-data' => $download_data_markup,
+                        'download-data'  => $download_data_markup,
+                        'resend-email'   => $resend_email_markup,
+                        'delete-request' => $delete_request_markup,
                 );
 
                 return sprintf( '<a href="%1$s">%2$s</a> %3$s', esc_url( 'mailto:' . $item->email ), $item->email, $this->row_actions( $row_actions ) );

src/wp-admin/includes/class-wp-privacy-data-removal-requests-list-table.php

@@ -68 +68 @@
 
                         $remove_data_markup .= '</div>';
 
+                        $resend_email_markup = '<span>';
+
+                        $resend_email_markup .= sprintf(
+                                '<a href="%s" class="resendemail" aria-label="%s">%s</a>',
+                                esc_url(
+                                        wp_nonce_url(
+                                                add_query_arg(
+                                                        array(
+                                                                'action'     => 'resend',
+                                                                'request_id' => array( $request_id ),
+                                                        ),
+                                                        admin_url( 'erase-personal-data.php' )
+                                                ),
+                                                'bulk-privacy_requests'
+                                        )
+                                ),
+                                /* translators: %s: Taxonomy term name. */
+                                esc_attr( sprintf( __( 'Resend erasure request confirmation email to &#8220;%s&#8221; ' ), $item->email ) ),
+                                __( 'Resend Confirmation Email' )
+                        );
+
+                        $resend_email_markup .= '</span>';
+
+                        $delete_request_markup = '<span class="trash">';
+
+                        $delete_request_markup .= sprintf(
+                                '<a href="%s" class="deleterequest" aria-label="%s">%s</a>',
+                                esc_url(
+                                        wp_nonce_url(
+                                                add_query_arg(
+                                                        array(
+                                                                'action'     => 'delete',
+                                                                'request_id' => array( $request_id ),
+                                                        ),
+                                                        admin_url( 'erase-personal-data.php' )
+                                                ),
+                                                'bulk-privacy_requests'
+                                        )
+                                ),
+                                /* translators: %s: Taxonomy term name. */
+                                esc_attr( sprintf( __( 'Delete &#8220;%s&#8221; erasure request' ), $item->email ) ),
+                                __( 'Delete Request' )
+                        );
+
+                        $delete_request_markup .= '</span>';
+
                         $row_actions = array(
-                                'remove-data' => $remove_data_markup,
+                                'remove-data'    => $remove_data_markup,
+                                'resend-email'   => $resend_email_markup,
+                                'delete-request' => $delete_request_markup,
                         );
                 }
 

src/wp-admin/includes/class-wp-privacy-requests-table.php

@@ -249 +249 @@
                                         }
                                 }
 
-                                add_settings_error(
-                                        'bulk_action',
-                                        'bulk_action',
-                                        /* translators: %d: Number of requests. */
-                                        sprintf( _n( 'Re-sent %d request', 'Re-sent %d requests', $count ), $count ),
-                                        'success'
-                                );
+                                if ( 1 === $count ) {
+                                        $email = get_the_title( $request_id );
+                                        add_settings_error(
+                                                'bulk_action',
+                                                'bulk_action',
+                                                /* translators:  %1$s: Email that the request has been sent. */
+                                                sprintf( __( 'Request confirmation email has been re-sent to %1$s' ), esc_attr( $email ) ),
+                                                'success'
+                                        );
+                                } else {
+                                        add_settings_error(
+                                                'bulk_action',
+                                                'bulk_action',
+                                                /* translators: %d: Number of requests. */
+                                                sprintf( __( '%d request confirmaton emails have been re-sent' ), esc_attr( $count ) ),
+                                                'success'
+                                        );
+                                }
+
                                 break;
                 }
         }