Ticket #6820: detach_media2.diff

wp-admin/admin-ajax.php

@@ -1467 +1467 @@
 case 'time_format' :
         die( date_i18n( sanitize_option( 'time_format', $_POST['date'] ) ) );
         break;
+case 'detach_media' :
+        $post_id = intval( $_POST['post_id'] );
+        if ( !current_user_can( 'edit_post', $post_id ) )
+                die( '-1' );
+        $parent_id = intval( $wpdb->get_var( $wpdb->prepare( "SELECT post_parent FROM $wpdb->posts WHERE post_type = 'attachment' AND ID = %d", $post_id ) ) );
+        if ( !current_user_can( 'edit_post', $parent_id ) )
+                die( '-1' );
+        $detached = $wpdb->update( $wpdb->posts, array( 'post_parent' => 0 ), array( 'post_type' => 'attachment', 'ID' => $post_id ) );
+        die($detached);
+        break;
 default :
         do_action( 'wp_ajax_' . $_POST['action'] );
         die('0');

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

@@ -79 +79 @@
                 $actions['delete'] = __( 'Delete Permanently' );
                 if ( $this->detached )
                         $actions['attach'] = __( 'Attach to a post' );
-
+                else
+                        $actions['detach'] = __( 'Detach media' );
                 return $actions;
         }
 
@@ -289 +290 @@
 ?>
                         <td <?php echo $attributes ?>>
                                 <strong><a href="<?php echo get_edit_post_link( $post->post_parent ); ?>"><?php echo $title ?></a></strong>,
-                                <?php echo get_the_time( __( 'Y/m/d' ) ); ?>
+                                <?php echo get_the_time( __( 'Y/m/d' ) ); ?><br />
+                                <a class="hide-if-no-js detach-media" href="#the-list"><?php _e( 'Detach' ); ?></a>
                         </td>
 <?php
                 } else {
 ?>
                         <td <?php echo $attributes ?>><?php _e( '(Unattached)' ); ?><br />
-                        <a class="hide-if-no-js" onclick="findPosts.open( 'media[]','<?php echo $post->ID ?>' );return false;" href="#the-list"><?php _e( 'Attach' ); ?></a></td>
+                        <a class="hide-if-no-js attach-media" href="#the-list"><?php _e( 'Attach' ); ?></a></td>
 <?php
                 }
                 break;

wp-admin/js/media.dev.js

@@ -1 +1 @@
 
-var findPosts;
+var findPosts, detachMedia;
 (function($){
         findPosts = {
                 open : function(af_name, af_val) {
@@ -71 +71 @@
                         }
                 }
         };
+        
+        detachMedia = {
+                detach : function(id) {
+                        var post = {
+                                post_id: id,
+                                action: 'detach_media',
+                                _ajax_nonce: $('#_ajax_nonce').val()
+                        };
+                        $.ajax({
+                                type : 'POST',
+                                url : ajaxurl,
+                                data : post,
+                                success : function(x) { detachMedia.show(x, id); },
+                                error : function(r) { detachMedia.error(r); }
+                        });
+                },
 
+                show : function(x, id) {
+
+                        if ( x == '-1' ) {
+                                this.showMessage("Sorry you don't have permission to detach that media file.", true);
+                                return;
+                        }
+
+                        $('#post-' + id + ' td.parent').html('(Unattached)<br /><a href="#the-list" class="hide-if-no-js attach-media">Attach</a>');
+
+                        var count = $('.subsubsub .detached .count').html();
+                        count = parseInt(count.substr(1, count.length - 2), 10);
+                        $('.subsubsub .detached .count').html('(' + (count + 1) + ')');
+                        
+                        this.showMessage('Detached 1 media file.');
+                },
+
+                showMessage: function(message, isError) {
+                        message = message.replace( /<.[^<>]*?>/g, '' );
+                        var className = 'below-h2 ' + ((isError) ? 'error' : 'updated');
+                        if ($('#message').length > 0) {
+                                $('message').attr('class', className);
+                                $('#message').html('<p>' + message + '</p>');
+                        } else {
+                                $('h2').after('<div id="message" class="' + className + '"><p>' + message + '</p></div>');
+                        }
+                }
+                
+        };
+
         $(document).ready(function() {
                 $('#find-posts-submit').click(function(e) {
                         if ( '' == $('#find-posts-response').html() )
@@ -93 +138 @@
                                 }
                         });
                 });
+                $('#the-list').delegate('.attach-media', 'click', function(e) {
+                        var idMatch = $(this).parents('tr').attr('id').match(/post-(\d)/);
+                        if ( idMatch ) {
+                                findPosts.open('media[]', idMatch[1]);
+                                e.preventDefault();
+                        }
+                });
+                
+                $('#the-list').delegate('.detach-media', 'click', function(e) {
+                        var idMatch = $(this).parents('tr').attr('id').match(/post-(\d)/);
+                        if ( idMatch ) {
+                                detachMedia.detach(idMatch[1]);
+                                e.preventDefault();
+                        }
+                });
         });
 })(jQuery);

wp-admin/upload.php

@@ -89 +89 @@
                                 exit;
                         }
                         break;
+                case 'detach':
+                        $detach = array();
+                        foreach ( (array) $_REQUEST['media'] as $att_id ) {
+                                $att_id = (int) $att_id;
+
+                                if ( !current_user_can( 'edit_post', $att_id ) )
+                                        continue;
+
+                                $detach[] = $att_id;
+                                clean_attachment_cache( $att_id );
+                        }
+
+                        if ( ! empty( $detach ) ) {
+                                $parent_ids = $wpdb->get_col( $wpdb->prepare( "SELECT post_parent FROM $wpdb->posts WHERE post_type = 'attachment' AND ID IN ( $detach )" ) );
+                                foreach ( $parent_ids as $parent_id ) {
+                                        if ( !current_user_can( 'edit_post', $parent_id ) )
+                                                wp_die( __( 'You are not allowed to edit this post.' ) );
+                                }
+                                
+                                $detach = implode( ',', $detach );
+                                $detached = $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_parent = 0 WHERE post_type = 'attachment' AND ID IN ( $detach )" ) );
+                        }
+
+                        if ( isset( $detached ) ) {
+                                $location = 'upload.php';
+                                if ( $referer = wp_get_referer() ) {
+                                        if ( false !== strpos( $referer, 'upload.php' ) )
+                                                $location = $referer;
+                                }
+
+                                $location = add_query_arg( array( 'detached_media' => $detached ) , $location );
+                                wp_redirect( $location );
+                                exit;
+                        }
+                        break;
                 case 'trash':
                         foreach ( (array) $post_ids as $post_id ) {
                                 if ( !current_user_can( 'delete_post', $post_id ) )
@@ -178 +213 @@
         $_SERVER['REQUEST_URI'] = remove_query_arg(array('attached'), $_SERVER['REQUEST_URI']);
 }
 
+if ( isset($_GET['detached_media']) && (int) $_GET['detached_media'] ) {
+        $detached = (int) $_GET['detached_media'];
+        $message = sprintf( _n('Detached %d media file.', 'Detached %d media files.', $detached), $detached );
+        $_SERVER['REQUEST_URI'] = remove_query_arg(array('detached_media'), $_SERVER['REQUEST_URI']);
+}
+
 if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) {
         $message = sprintf( _n( 'Media attachment permanently deleted.', '%d media attachments permanently deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) );
         $_SERVER['REQUEST_URI'] = remove_query_arg(array('deleted'), $_SERVER['REQUEST_URI']);