Changeset 22967

Timestamp:

12/02/2012 04:06:31 PM (13 years ago)

Author:

nacin

Message:

Allow the 'Uploaded to this post' view to be sorted, saving the resulting order as menu_order.

This functionality is designed to be backwards compatible with manual querying for attachments by menu_order.

props koopersmith.
see #22607.

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-includes/js/media-models.js (modified) (1 diff)
• wp-includes/js/media-views.js (modified) (9 diffs)
• wp-includes/media.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -57 +57 @@
     'wp-remove-post-lock', 'dismiss-wp-pointer', 'upload-attachment', 'get-attachment',
     'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
-    'send-attachment-to-editor',
+    'send-attachment-to-editor', 'save-attachment-order',
 );
 

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

@@ -1928 +1928 @@
 }
 
+function wp_ajax_save_attachment_order() {
+    if ( ! isset( $_REQUEST['post_id'] ) )
+        wp_send_json_error();
+
+    if ( ! $post_id = absint( $_REQUEST['post_id'] ) )
+        wp_send_json_error();
+
+    if ( empty( $_REQUEST['attachments'] ) )
+        wp_send_json_error();
+
+    check_ajax_referer( 'update-post_' . $post_id, 'nonce' );
+
+    $attachments = $_REQUEST['attachments'];
+
+    if ( ! current_user_can( 'edit_post', $post_id ) )
+        wp_send_json_error();
+
+    $post = get_post( $post_id, ARRAY_A );
+
+    foreach ( $attachments as $attachment_id => $menu_order ) {
+        if ( ! current_user_can( 'edit_post', $attachment_id ) )
+            continue;
+        if ( ! $attachment = get_post( $attachment_id ) )
+            continue;
+        if ( 'attachment' != $attachment->post_type )
+            continue;
+
+        wp_update_post( array( 'ID' => $attachment_id, 'menu_order' => $menu_order ) );
+    }
+
+    wp_send_json_success();
+}
+
 /**
  * Generates the HTML to send an attachment to the editor.

trunk/wp-includes/js/media-models.js

@@ -524 +524 @@
             if ( this.props.get('query') )
                 this.mirror( Query.get( this.props.toJSON() ) );
+        },
+
+        // If this collection is sorted by `menuOrder`, recalculates and saves
+        // the menu order to the database.
+        saveMenuOrder: function() {
+            if ( 'menuOrder' !== this.props.get('orderby') )
+                return;
+
+            // Removes any uploading attachments, updates each attachment's
+            // menu order, and returns an object with an { id: menuOrder }
+            // mapping to pass to the request.
+            var attachments = this.chain().filter( function( attachment ) {
+                return ! _.isUndefined( attachment.id );
+            }).map( function( attachment, index ) {
+                // Indices start at 1.
+                index = index + 1;
+                attachment.set( 'menuOrder', index );
+                return [ attachment.id, index ];
+            }).object().value();
+
+            if ( _.isEmpty( attachments ) )
+                return;
+
+            return media.post( 'save-attachment-order', {
+                nonce:       media.model.settings.updatePostNonce,
+                post_id:     media.model.settings.postId,
+                attachments: attachments
+            });
         }
     }, {

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

@@ -15 +15 @@
     // Copy the `postId` setting over to the model settings.
     media.model.settings.postId = media.view.settings.postId;
+    media.model.settings.updatePostNonce = media.view.settings.nonce.updatePost;
 
     // Check if the browser supports CSS 3.0 transitions
@@ -268 +269 @@
             searchable: true,
             filterable: false,
-            uploads:    true
+            uploads:    true,
+            sortable:   true
         },
 
@@ -2691 +2693 @@
 
             this.initSortable();
-            this.collection.props.on( 'change:orderby', this.refreshSortable, this );
 
             _.bindAll( this, 'css' );
@@ -2735 +2736 @@
 
         initSortable: function() {
-            var collection = this.collection,
+            var view = this,
+                collection = this.collection,
                 from;
 
@@ -2761 +2763 @@
                 // Do so silently, as the view is already accurate.
                 update: function( event, ui ) {
-                    var model = collection.at( from );
-
+                    var model = collection.at( from ),
+                        comparator = collection.comparator;
+
+                    // Temporarily disable the comparator to prevent `add`
+                    // from re-sorting.
+                    delete collection.comparator;
+
+                    // Silently shift the model to its new index.
                     collection.remove( model, {
                         silent: true
@@ -2769 +2777 @@
                         silent: true
                     });
+
+                    // Restore the comparator.
+                    collection.comparator = comparator;
+
+                    // If the collection is sorted by menu order,
+                    // update the menu order.
+                    view.saveMenuOrder();
+
+                    // Make sure any menu-order-related callbacks are bound.
+                    view.refreshSortable();
                 }
             });
@@ -2777 +2795 @@
                 this.$el.sortable( 'option', 'disabled', !! collection.comparator );
             }, this );
+
+            this.collection.props.on( 'change:orderby', this.refreshSortable, this );
+            this.refreshSortable();
         },
 
@@ -2784 +2805 @@
 
             // If the `collection` has a `comparator`, disable sorting.
-            this.$el.sortable( 'option', 'disabled', !! this.collection.comparator );
+            var collection = this.collection,
+                orderby = collection.props.get('orderby'),
+                enabled = 'menuOrder' === orderby || ! collection.comparator,
+                hasMenuOrder;
+
+            this.$el.sortable( 'option', 'disabled', ! enabled );
+
+            // Check if any attachments have a specified menu order.
+            hasMenuOrder = this.collection.any( function( attachment ) {
+                return attachment.get('menuOrder');
+            });
+
+            // Always unbind the `saveMenuOrder` callback to prevent multiple
+            // callbacks stacking up.
+            this.collection.off( 'change:uploading', this.saveMenuOrder, this );
+
+            if ( hasMenuOrder )
+                this.collection.on( 'change:uploading', this.saveMenuOrder, this );
+
+        },
+
+        saveMenuOrder: function() {
+            this.collection.saveMenuOrder();
         },
 
@@ -3050 +3093 @@
             }
 
-            if ( this.options.sortable ) {
+            if ( this.options.sortable && ! this.options.filters ) {
                 this.toolbar.set( 'dragInfo', new media.View({
                     el: $( '<div class="instructions">' + l10n.dragInfo + '</div>' )[0],

trunk/wp-includes/media.php

@@ -1434 +1434 @@
         $post = get_post( $args['post'] );
         $settings['postId'] = $post->ID;
+        $settings['nonce']['updatePost'] = wp_create_nonce( 'update-post_' . $post->ID );
     }