Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

See #6820.

Built from https://develop.svn.wordpress.org/trunk@31619


git-svn-id: http://core.svn.wordpress.org/trunk@31600 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-03-05 05:35:28 +00:00
parent 0250aebf2a
commit d3471e9850
10 changed files with 127 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/includes/ajax-actions.php
View File

@ -2267,6 +2267,9 @@ function wp_ajax_save_attachment() {
if ( 'attachment' != $post['post_type'] )
wp_send_json_error();
if ( isset( $changes['parent'] ) )
$post['post_parent'] = $changes['parent'];
if ( isset( $changes['title'] ) )
$post['post_title'] = $changes['title'];

14
wp-admin/includes/class-wp-media-list-table.php
View File

@ -139,6 +139,9 @@ class WP_Media_List_Table extends WP_List_Table {
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'] ) )
return 'delete_all';
@ -406,7 +409,16 @@ foreach ( $columns as $column_name => $column_display_name ) {
} else {
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
} else {

58
wp-admin/includes/media.php
View File

@ -3010,3 +3010,61 @@ function wp_read_audio_metadata( $file ) {
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;
}
}

52
wp-admin/upload.php
View File

@ -113,45 +113,14 @@ if ( $doaction ) {
}
switch ( $doaction ) {
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;
}
case 'detach':
wp_media_attach_action( $_REQUEST['parent_post_id'], 'detach' );
break;
case 'attach':
wp_media_attach_action( $_REQUEST['found_post_id'] );
break;
case 'trash':
if ( !isset( $post_ids ) )
break;
@ -256,7 +225,12 @@ if ( ! empty( $_GET['posted'] ) ) {
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'] );
}
if ( ! empty( $_GET['deleted'] ) && $deleted = absint( $_GET['deleted'] ) ) {

18
wp-includes/js/media/views.js
View File

@ -2656,6 +2656,7 @@ Attachment = View.extend({
this.listenTo( this.model, 'change', this.render );
} 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 );
this.listenTo( this.model, 'change:caption', this._syncCaption );
@ -3195,7 +3196,8 @@ Details = Attachment.extend({
'click .untrash-attachment': 'untrashAttachment',
'click .edit-attachment': 'editAttachment',
'click .refresh-attachment': 'refreshAttachment',
'keydown': 'toggleSelectionHandler'
'keydown': 'toggleSelectionHandler',
'click .detach-from-parent': 'detachFromParent'
},
initialize: function() {
@ -3294,6 +3296,20 @@ Details = Attachment.extend({
this.controller.trigger( 'attachment:keydown:arrow', event );
return;
}
},
/**
* @param {Object} event
*/
detachFromParent: function( event ) {
event.preventDefault();
this.model.save({
'parent' : 0,
'uploadedTo' : 0,
'uploadedToLink' : '',
'uploadedToTitle' : ''
});
}
});

4
wp-includes/js/media/views.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
wp-includes/js/media/views/attachment.js
View File

@ -52,6 +52,7 @@ Attachment = View.extend({
this.listenTo( this.model, 'change', this.render );
} 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 );
this.listenTo( this.model, 'change:caption', this._syncCaption );

17
wp-includes/js/media/views/attachment/details.js
View File

@ -35,7 +35,8 @@ Details = Attachment.extend({
'click .untrash-attachment': 'untrashAttachment',
'click .edit-attachment': 'editAttachment',
'click .refresh-attachment': 'refreshAttachment',
'keydown': 'toggleSelectionHandler'
'keydown': 'toggleSelectionHandler',
'click .detach-from-parent': 'detachFromParent'
},
initialize: function() {
@ -134,6 +135,20 @@ Details = Attachment.extend({
this.controller.trigger( 'attachment:keydown:arrow', event );
return;
}
},
/**
* @param {Object} event
*/
detachFromParent: function( event ) {
event.preventDefault();
this.model.save({
'parent' : 0,
'uploadedTo' : 0,
'uploadedToLink' : '',
'uploadedToTitle' : ''
});
}
});

3
wp-includes/media-template.php
View File

@ -418,6 +418,9 @@ function wp_print_media_templates() {
<# } 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>
<# } #>
<div class="attachment-compat"></div>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-alpha-31618';
$wp_version = '4.2-alpha-31619';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.