Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Media: Display an error message in grid view if the attachment could not be deleted. 

Previously, the attachment was silently removed from the grid but reappeared after a page reload.

Follow-up to [22869].

Props kapilpaul, costdev, mukesh27, azouamauriac, SergeyBiryukov.
Fixes #55158.
Built from https://develop.svn.wordpress.org/trunk@52725


git-svn-id: http://core.svn.wordpress.org/trunk@52314 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2022-02-14 14:21:05 +00:00
parent 3c27e50dd6
commit 21a51e9993
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/js/media-views.js
View File

@ -8491,7 +8491,13 @@ Details = Attachment.extend(/** @lends wp.media.view.Attachment.Details.prototyp
this.getFocusableElements();
if ( window.confirm( l10n.warnDelete ) ) {
this.model.destroy();
this.model.destroy( {
wait: true,
error: function() {
window.alert( l10n.errorDeleting );
}
} );
this.moveFocus();
}
},

2
wp-includes/js/media-views.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
wp-includes/media.php
View File

@ -4482,6 +4482,7 @@ function wp_enqueue_media( $args = array() ) {
'trashSelected' => __( 'Move to Trash' ),
'restoreSelected' => __( 'Restore from Trash' ),
'deletePermanently' => __( 'Delete permanently' ),
'errorDeleting' => __( 'Error in deleting the attachment.' ),
'apply' => __( 'Apply' ),
'filterByDate' => __( 'Filter by date' ),
'filterByType' => __( 'Filter by type' ),

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '6.0-alpha-52724';
$wp_version = '6.0-alpha-52725';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.