Changeset 29755 for trunk

Timestamp:

09/21/2014 06:51:41 PM (12 years ago)

Author:

wonderboymusic

Message:

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.

File:

• trunk/src/wp-includes/js/media-views.js (modified) (2 diffs)

trunk/src/wp-includes/js/media-views.js

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