Changeset 30409 for branches/4.0

Timestamp:

11/20/2014 11:08:11 AM (12 years ago)

Author:

nacin

Message:

Media Grid: Don't attempt to delete an attachment that can't be deleted.

Merges [29755] to the 4.0 branch.

props wonderboymusic.
fixes #29597.

Location:

branches/4.0

Files:

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

branches/4.0/src/wp-includes/js/media-views.js

@@ -5851 +5851 @@
                                         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' );
@@ -5870 +5870 @@
                                                 }
 
-                                                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 );