Changeset 29490 for trunk/src/wp-admin/includes/ajax-actions.php

Timestamp:

08/14/2014 06:30:49 PM (11 years ago)

Author:

wonderboymusic

Message:

Media Grid, support MEDIA_TRASH:

• Add a setting to _wpMediaViewsL10n.settings: mediaTrash
• In the attachment edit modal, properly toggle between Trash/Untrash
• In media.view.Attachment, add a method for untrashAttachment
• When creating the grid toolbar, switch the setting order of subviews so that media.view.DeleteSelectedButton can listen to the instance of media.view.AttachmentFilters.All to update the text in its UI.
• Add a new filter to media.view.AttachmentFilters.All, trash, when settings.mediaTrash is true
• Allow the cached queries in Query.get() to be flushed when race conditions exist and collections need to be refreshed. This is currently only being used when MEDIA_TRASH is set, to refresh the filtered/mirrored collections related to all, trash, and any already queried filter.
• Cleanup the bootstrapping of media.view.MediaFrame.Manage
• Allow wp_ajax_query_attachments() to return items from the trash when MEDIA_TRASH is true
• Allow wp_ajax_save_attachment() to set post_status when MEDIA_TRASH is true. It allows wp_delete_post() to be called, which will trash the attachment instead of deleting when the flag is set.

Props koop for the knowledge sharing and thought partnership.
See #29145.

File:

• trunk/src/wp-admin/includes/ajax-actions.php (modified) (3 diffs)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -2162 +2162 @@
 
     $query['post_type'] = 'attachment';
-    $query['post_status'] = 'inherit';
+    if ( MEDIA_TRASH
+        && ! empty( $_REQUEST['query']['post_status'] )
+        && 'trash' === $_REQUEST['query']['post_status'] ) {
+        $query['post_status'] = 'trash';
+    } else {
+        $query['post_status'] = 'inherit';
+    }
+
     if ( current_user_can( get_post_type_object( 'attachment' )->cap->read_private_posts ) )
         $query['post_status'] .= ',private';
@@ -2216 +2223 @@
     if ( isset( $changes['description'] ) )
         $post['post_content'] = $changes['description'];
+
+    if ( MEDIA_TRASH && isset( $changes['status'] ) )
+        $post['post_status'] = $changes['status'];
 
     if ( isset( $changes['alt'] ) ) {
@@ -2244 +2254 @@
     }
 
-    wp_update_post( $post );
+    if ( MEDIA_TRASH && isset( $changes['status'] ) && 'trash' === $changes['status'] ) {
+        wp_delete_post( $id );
+    } else {
+        wp_update_post( $post );
+    }
+
     wp_send_json_success();
 }