Ticket #46619: 46619.diff
File 46619.diff, 6.2 KB (added by , 5 years ago) |
---|
-
src/wp-admin/css/forms.css
1218 1218 position: static; 1219 1219 } 1220 1220 1221 .privacy_requests .row-actions .remove-personal-data, 1222 .privacy_requests .row-actions .export-personal-data { 1223 display: inline-block; 1224 } 1225 1221 1226 .privacy_requests tbody .has-request-results th { 1222 1227 box-shadow: none; 1223 1228 } -
src/wp-admin/includes/class-wp-privacy-data-export-requests-list-table.php
63 63 64 64 $download_data_markup .= '</div>'; 65 65 66 $complete_request_markup = '<span>'; 67 $complete_request_markup .= sprintf( 68 '<a href="%s" class="complete-request" aria-label="%s">%s</a>', 69 esc_url( 70 wp_nonce_url( 71 add_query_arg( 72 array( 73 'action' => 'complete', 74 'request_id' => array( $request_id ), 75 ), 76 admin_url( 'export-personal-data.php' ) 77 ), 78 'bulk-privacy_requests' 79 ) 80 ), 81 esc_attr( 82 sprintf( 83 /* translators: %s: Request email. */ 84 __( 'Mark export request for “%s” as completed.' ), 85 $item->email 86 ) 87 ), 88 __( 'Complete Request' ) 89 ); 90 $complete_request_markup .= '</span>'; 91 66 92 $row_actions = array( 67 'download-data' => $download_data_markup, 93 'download-data' => $download_data_markup, 94 'complete-request' => $complete_request_markup, 68 95 ); 69 96 70 97 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
47 47 $row_actions = array(); 48 48 49 49 // Allow the administrator to "force remove" the personal data even if confirmation has not yet been received. 50 $status = $item->status; 50 $status = $item->status; 51 $row_actions = array(); 51 52 if ( 'request-confirmed' !== $status ) { 52 53 /** This filter is documented in wp-admin/includes/ajax-actions.php */ 53 54 $erasers = apply_filters( 'wp_privacy_personal_data_erasers', array() ); … … 68 69 69 70 $remove_data_markup .= '</div>'; 70 71 71 $row_actions = array( 72 'remove-data' => $remove_data_markup, 73 ); 72 $row_actions['remove-data'] = $remove_data_markup; 74 73 } 75 74 75 $complete_request_markup = '<span>'; 76 $complete_request_markup .= sprintf( 77 '<a href="%s" class="complete-request" aria-label="%s">%s</a>', 78 esc_url( 79 wp_nonce_url( 80 add_query_arg( 81 array( 82 'action' => 'complete', 83 'request_id' => array( $request_id ), 84 ), 85 admin_url( 'erase-personal-data.php' ) 86 ), 87 'bulk-privacy_requests' 88 ) 89 ), 90 esc_attr( 91 sprintf( 92 /* translators: %s: Request email. */ 93 __( 'Mark export request for “%s” as completed.' ), 94 $item->email 95 ) 96 ), 97 __( 'Complete Request' ) 98 ); 99 $complete_request_markup .= '</span>'; 100 101 $row_actions['complete-request'] = $complete_request_markup; 102 76 103 return sprintf( '<a href="%1$s">%2$s</a> %3$s', esc_url( 'mailto:' . $item->email ), $item->email, $this->row_actions( $row_actions ) ); 77 104 } 78 105 -
src/wp-admin/includes/class-wp-privacy-requests-table.php
210 210 */ 211 211 protected function get_bulk_actions() { 212 212 return array( 213 'delete' => __( 'Delete Requests' ), 214 'resend' => __( 'Resend Confirmation Requests' ), 213 'resend' => __( 'Resend Confirmation Requests' ), 214 'complete' => __( 'Mark Requests as Completed' ), 215 'delete' => __( 'Delete Requests' ), 215 216 ); 216 217 } 217 218 … … 219 220 * Process bulk actions. 220 221 * 221 222 * @since 4.9.6 223 * @since 5.6.0 Added support for the `complete` action. 222 224 */ 223 225 public function process_bulk_action() { 224 226 $action = $this->current_action(); … … 231 233 } 232 234 233 235 switch ( $action ) { 234 case ' delete':236 case 'resend': 235 237 foreach ( $request_ids as $request_id ) { 236 if ( wp_delete_post( $request_id, true ) ) { 237 $count ++; 238 $resend = _wp_privacy_resend_request( $request_id ); 239 240 if ( $resend && ! is_wp_error( $resend ) ) { 241 $count++; 238 242 } 239 243 } 240 244 … … 242 246 'bulk_action', 243 247 'bulk_action', 244 248 /* translators: %d: Number of requests. */ 245 sprintf( _n( ' Deleted %d request.', 'Deleted%d requests.', $count ), $count ),249 sprintf( _n( 'Re-sent %d request.', 'Re-sent %d requests.', $count ), $count ), 246 250 'success' 247 251 ); 248 252 break; 249 case ' resend':253 case 'complete': 250 254 foreach ( $request_ids as $request_id ) { 251 $res end = _wp_privacy_resend_request( $request_id );255 $result = _wp_privacy_completed_request( $request_id ); 252 256 253 if ( $res end && ! is_wp_error( $resend) ) {257 if ( $result && ! is_wp_error( $result ) ) { 254 258 $count++; 255 259 } 256 260 } … … 259 263 'bulk_action', 260 264 'bulk_action', 261 265 /* translators: %d: Number of requests. */ 262 sprintf( _n( ' Re-sent %d request.', 'Re-sent %d requests.', $count ), $count ),266 sprintf( _n( '%d request marked as complete.', '%d requests marked as complete.', $count ), $count ), 263 267 'success' 264 268 ); 265 269 break; 270 case 'delete': 271 foreach ( $request_ids as $request_id ) { 272 if ( wp_delete_post( $request_id, true ) ) { 273 $count ++; 274 } 275 } 276 277 add_settings_error( 278 'bulk_action', 279 'bulk_action', 280 /* translators: %d: Number of requests. */ 281 sprintf( _n( 'Deleted %d request.', 'Deleted %d requests.', $count ), $count ), 282 'success' 283 ); 284 break; 266 285 } 267 286 } 268 287