Media Grid:

* In Bulk Edit mode, don't attempt to delete or trash an attachment that doesn't have a `delete` nonce. The subsequent `_requery()` will then properly display the attachment still present in the library.
* Remove all updated models from the selection at the same time to avoid async race conditions. The selection is reset when the grid's `select` mode is deactivated, but this allows this view instance to be more portable.

This fix allows users to set caps on individual attachments without confusing the grid's library. This issue was present for bulk actions in general, had nothing to do with `MEDIA_TRASH` specifically.

Fixes #29597.

Built from https://develop.svn.wordpress.org/trunk@29755


git-svn-id: http://core.svn.wordpress.org/trunk@29527 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-09-21 18:52:16 +00:00
parent 26124b9aad
commit f30266acb9
2 changed files with 13 additions and 7 deletions

View File

@ -6029,7 +6029,7 @@
controller: this.controller, controller: this.controller,
priority: -60, priority: -60,
click: function() { click: function() {
var model, changed = [], self = this, var changed = [], removed = [], self = this,
selection = this.controller.state().get( 'selection' ), selection = this.controller.state().get( 'selection' ),
library = this.controller.state().get( 'library' ); library = this.controller.state().get( 'library' );
@ -6048,22 +6048,28 @@
return; return;
} }
while ( selection.length > 0 ) { selection.each( function( model ) {
model = selection.at( 0 ); if ( ! model.get( 'nonces' )['delete'] ) {
removed.push( model );
return;
}
if ( media.view.settings.mediaTrash && 'trash' === model.get( 'status' ) ) { if ( media.view.settings.mediaTrash && 'trash' === model.get( 'status' ) ) {
model.set( 'status', 'inherit' ); model.set( 'status', 'inherit' );
changed.push( model.save() ); changed.push( model.save() );
selection.remove( model ); removed.push( model );
} else if ( media.view.settings.mediaTrash ) { } else if ( media.view.settings.mediaTrash ) {
model.set( 'status', 'trash' ); model.set( 'status', 'trash' );
changed.push( model.save() ); changed.push( model.save() );
selection.remove( model ); removed.push( model );
} else { } else {
model.destroy(); model.destroy();
} }
} } );
if ( changed.length ) { if ( changed.length ) {
selection.remove( removed );
$.when.apply( null, changed ).then( function() { $.when.apply( null, changed ).then( function() {
library._requery( true ); library._requery( true );
self.controller.trigger( 'selection:action:done' ); self.controller.trigger( 'selection:action:done' );

File diff suppressed because one or more lines are too long