Changeset 29271

Timestamp:

07/22/2014 08:46:22 PM (11 years ago)

Author:

ocean90

Message:

Media Grid: Add a date filter.

props ericlewis.
fixes #28895.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• wp-includes/js/media-grid.js (modified) (2 diffs)
• wp-includes/js/media-views.js (modified) (2 diffs)
• wp-includes/media.php (modified) (4 diffs)

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

@@ -2157 +2157 @@
     $query = array_intersect_key( $query, array_flip( array(
         's', 'order', 'orderby', 'posts_per_page', 'paged', 'post_mime_type',
-        'post_parent', 'post__in', 'post__not_in',
+        'post_parent', 'post__in', 'post__not_in', 'year', 'monthnum'
     ) ) );
 
@@ -2714 +2714 @@
         $wp_scripts->done = array();
     }
-    
+
     if ( 'playlist' === $_REQUEST['type'] ) {
         wp_underscore_playlist_templates();

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

@@ -449 +449 @@
         /**
          * Render the EditImage view into the frame's content region.
-         * 
+         *
          * @param {Object} contentRegion Basic object with a `view` property, which
          *                               should be set with the proper region view.
@@ -650 +650 @@
     });
 
+    /**
+     * A filter dropdown for month/dates.
+     */
+    media.view.DateFilter = media.view.AttachmentFilters.extend({
+        id: 'media-attachment-date-filters',
+
+        createFilters: function() {
+            var filters = {};
+            _.each( media.view.settings.months || {}, function( value, index ) {
+                filters[ index ] = {
+                    text: value.text,
+                    props: {
+                        year: value.year,
+                        monthnum: value.month
+                    }
+                };
+            });
+            filters.all = {
+                text:  l10n.allDates,
+                props: {
+                    monthnum: false,
+                    year:  false
+                },
+                priority: 10
+            };
+            this.filters = filters;
+        }
+    });
+
 }(jQuery, _, Backbone, wp));

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

@@ -5507 +5507 @@
         },
 
+        /**
+         * @abstract
+         */
         createFilters: function() {
             this.filters = {};
         },
 
+        /**
+         * When the selection changes, set the Query properties
+         * accordingly for the selected filter.
+         */
         change: function() {
             var filter = this.filters[ this.el.value ];
-
             if ( filter ) {
                 this.model.set( filter.props );
@@ -5743 +5749 @@
                 }).render() );
 
-                this.toolbar.set( 'BulkSelection', new media.view.BulkSelection({
+                this.toolbar.set( 'bulkSelection', new media.view.BulkSelection({
                     controller: this.controller,
                     priority: -70
+                }).render() );
+                this.toolbar.set( 'dateFilter', new media.view.DateFilter({
+                    controller: this.controller,
+                    model:      this.collection.props,
+                    priority: -75
                 }).render() );
             }

trunk/src/wp-includes/media.php

@@ -2773 +2773 @@
         return;
 
-    global $content_width, $wpdb;
+    global $content_width, $wpdb, $wp_locale;
 
     $defaults = array(
@@ -2826 +2826 @@
         LIMIT 1
     " );
+    $months = $wpdb->get_results( $wpdb->prepare( "
+        SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
+        FROM $wpdb->posts
+        WHERE post_type = %s
+        ORDER BY post_date DESC
+    ", 'attachment' ) );
+    foreach ( $months as $month_year ) {
+        $month_year->text = sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $month_year->month ), $month_year->year );
+    }
 
     $settings = array(
@@ -2847 +2856 @@
         'embedMimes'   => $ext_mimes,
         'contentWidth' => $content_width,
+        'months'       => $months,
     );
 
@@ -2905 +2915 @@
         'allMediaItems'          => __( 'All media items' ),
         'allMediaTypes'          => __( 'All media types' ),
+        'allDates'               => __( 'All dates' ),
         'noItemsFound'           => __( 'No items found.' ),
         'insertIntoPost'         => $hier ? __( 'Insert into page' ) : __( 'Insert into post' ),