Changeset 31619

Timestamp:

03/05/2015 05:34:40 AM (10 years ago)

Author:

wonderboymusic

Message:

Allow attachments to be Detached from their parent in media grid and list modes.

See #6820.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-admin/includes/class-wp-media-list-table.php (modified) (2 diffs)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/upload.php (modified) (2 diffs)
• wp-includes/js/media/views.js (modified) (3 diffs)
• wp-includes/js/media/views/attachment.js (modified) (1 diff)
• wp-includes/js/media/views/attachment/details.js (modified) (2 diffs)
• wp-includes/media-template.php (modified) (1 diff)

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

@@ -2268 +2268 @@
         wp_send_json_error();
 
+    if ( isset( $changes['parent'] ) )
+        $post['post_parent'] = $changes['parent'];
+
     if ( isset( $changes['title'] ) )
         $post['post_title'] = $changes['title'];

trunk/src/wp-admin/includes/class-wp-media-list-table.php

@@ -139 +139 @@
         if ( isset( $_REQUEST['found_post_id'] ) && isset( $_REQUEST['media'] ) )
             return 'attach';
+
+        if ( isset( $_REQUEST['parent_post_id'] ) && isset( $_REQUEST['media'] ) )
+            return 'detach';
 
         if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
@@ -407 +410 @@
                     echo $title;
                 } ?></strong>,
-                <?php echo get_the_time( __( 'Y/m/d' ) ); ?>
+                <?php echo get_the_time( __( 'Y/m/d' ) ); ?><br />
+                <?php
+                if ( $user_can_edit ):
+                    $detach_url = add_query_arg( array(
+                        'parent_post_id' => $post->post_parent,
+                        'media[]' => $post->ID,
+                        '_wpnonce' => wp_create_nonce( 'bulk-' . $this->_args['plural'] )
+                    ), 'upload.php' ); ?>
+                <a class="hide-if-no-js detach-from-parent" href="<?php echo $detach_url ?>"><?php _e( 'Detach' ); ?></a>
+                <?php endif; ?>
             </td>
 <?php

trunk/src/wp-admin/includes/media.php

@@ -3011 +3011 @@
     return $metadata;
 }
+
+/**
+ * Encapsulate logic for Attach/Detach actions
+ *
+ * @since 4.2.0
+ *
+ * @global wpdb $wpdb
+ * @param int    $parent_id
+ * @param string $action
+ */
+function wp_media_attach_action( $parent_id, $action = 'attach' ) {
+    global $wpdb;
+
+    if ( ! $parent_id ) {
+        return;
+    }
+
+    if ( ! current_user_can( 'edit_post', $parent_id ) ) {
+        wp_die( __( 'You are not allowed to edit this post.' ) );
+    }
+    $ids = array();
+    foreach ( (array) $_REQUEST['media'] as $att_id ) {
+        $att_id = (int) $att_id;
+
+        if ( ! current_user_can( 'edit_post', $att_id ) ) {
+            continue;
+        }
+
+        $ids[] = $att_id;
+    }
+
+    if ( ! empty( $ids ) ) {
+        $ids_string = implode( ',', $ids );
+        if ( 'attach' === $action ) {
+            $result = $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_parent = %d WHERE post_type = 'attachment' AND ID IN ( $ids_string )", $parent_id ) );
+        } else {
+            $result = $wpdb->query( "UPDATE $wpdb->posts SET post_parent = 0 WHERE post_type = 'attachment' AND ID IN ( $ids_string )" );
+        }
+
+        foreach ( $ids as $att_id ) {
+            clean_attachment_cache( $att_id );
+        }
+    }
+
+    if ( isset( $result ) ) {
+        $location = 'upload.php';
+        if ( $referer = wp_get_referer() ) {
+            if ( false !== strpos( $referer, 'upload.php' ) ) {
+                $location = remove_query_arg( array( 'attached', 'detached' ), $referer );
+            }
+        }
+
+        $key = 'attach' === $action ? 'attached' : 'detached';
+        $location = add_query_arg( array( $key => $result ), $location );
+        wp_redirect( $location );
+        exit;
+    }
+}

trunk/src/wp-admin/upload.php

@@ -114 +114 @@
 
     switch ( $doaction ) {
+        case 'detach':
+            wp_media_attach_action( $_REQUEST['parent_post_id'], 'detach' );
+            break;
+
         case 'attach':
-            $parent_id = (int) $_REQUEST['found_post_id'];
-            if ( !$parent_id )
-                return;
-
-            $parent = get_post( $parent_id );
-            if ( !current_user_can( 'edit_post', $parent_id ) )
-                wp_die( __( 'You are not allowed to edit this post.' ) );
-
-            $attach = array();
-            foreach ( (array) $_REQUEST['media'] as $att_id ) {
-                $att_id = (int) $att_id;
-
-                if ( !current_user_can( 'edit_post', $att_id ) )
-                    continue;
-
-                $attach[] = $att_id;
-            }
-
-            if ( ! empty( $attach ) ) {
-                $attach_string = implode( ',', $attach );
-                $attached = $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_parent = %d WHERE post_type = 'attachment' AND ID IN ( $attach_string )", $parent_id ) );
-                foreach ( $attach as $att_id ) {
-                    clean_attachment_cache( $att_id );
-                }
-            }
-
-            if ( isset( $attached ) ) {
-                $location = 'upload.php';
-                if ( $referer = wp_get_referer() ) {
-                    if ( false !== strpos( $referer, 'upload.php' ) )
-                        $location = $referer;
-                }
-
-                $location = add_query_arg( array( 'attached' => $attached ) , $location );
-                wp_redirect( $location );
-                exit;
-            }
-            break;
+            wp_media_attach_action( $_REQUEST['found_post_id'] );
+            break;
+
         case 'trash':
             if ( !isset( $post_ids ) )
@@ -257 +226 @@
 if ( ! empty( $_GET['attached'] ) && $attached = absint( $_GET['attached'] ) ) {
     $message = sprintf( _n('Reattached %d attachment.', 'Reattached %d attachments.', $attached), $attached );
-    $_SERVER['REQUEST_URI'] = remove_query_arg(array('attached'), $_SERVER['REQUEST_URI']);
+    $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detached', 'attached' ), $_SERVER['REQUEST_URI'] );
+}
+
+if ( ! empty( $_GET['detached'] ) && $detached = absint( $_GET['detached'] ) ) {
+    $message = sprintf( _n( 'Detached %d attachment.', 'Detached %d attachments.', $detached ), $detached );
+    $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detached', 'attached' ), $_SERVER['REQUEST_URI'] );
 }
 

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

@@ -2657 +2657 @@
         } else {
             this.listenTo( this.model, 'change:percent', this.progress );
+            this.listenTo( this.model, 'change:parent', this.render );
         }
         this.listenTo( this.model, 'change:title', this._syncTitle );
@@ -3196 +3197 @@
         'click .edit-attachment':         'editAttachment',
         'click .refresh-attachment':      'refreshAttachment',
-        'keydown':                        'toggleSelectionHandler'
+        'keydown':                        'toggleSelectionHandler',
+        'click .detach-from-parent':      'detachFromParent'
     },
 
@@ -3295 +3297 @@
             return;
         }
+    },
+
+    /**
+     * @param {Object} event
+     */
+    detachFromParent: function( event ) {
+        event.preventDefault();
+
+        this.model.save({
+            'parent' : 0,
+            'uploadedTo' : 0,
+            'uploadedToLink' : '',
+            'uploadedToTitle' : ''
+        });
     }
 });

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

@@ -53 +53 @@
         } else {
             this.listenTo( this.model, 'change:percent', this.progress );
+            this.listenTo( this.model, 'change:parent', this.render );
         }
         this.listenTo( this.model, 'change:title', this._syncTitle );

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

@@ -36 +36 @@
         'click .edit-attachment':         'editAttachment',
         'click .refresh-attachment':      'refreshAttachment',
-        'keydown':                        'toggleSelectionHandler'
+        'keydown':                        'toggleSelectionHandler',
+        'click .detach-from-parent':      'detachFromParent'
     },
 
@@ -135 +136 @@
             return;
         }
+    },
+
+    /**
+     * @param {Object} event
+     */
+    detachFromParent: function( event ) {
+        event.preventDefault();
+
+        this.model.save({
+            'parent' : 0,
+            'uploadedTo' : 0,
+            'uploadedToLink' : '',
+            'uploadedToTitle' : ''
+        });
     }
 });

trunk/src/wp-includes/media-template.php

@@ -418 +418 @@
                         <# } else { #>
                             <span class="value">{{ data.uploadedToTitle }}</span>
+                        <# } #>
+                        <# if ( data.nonces.edit ) { #>
+                        <a class="detach-from-parent" data-id="{{ data.id }}" href="#">(<?php _e( 'Detach' ); ?>)</a>
                         <# } #>
                     </label>