Changeset 43056
- Timestamp:
- 05/01/2018 03:42:38 PM (7 years ago)
- Location:
- trunk/src
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/includes/ajax-actions.php
r43012 r43056 2628 2628 'post_mime_type', 2629 2629 'post_parent', 2630 'author', 2630 2631 'post__in', 2631 2632 'post__not_in', -
trunk/src/wp-admin/includes/class-wp-media-list-table.php
r42871 r43056 131 131 ); 132 132 } 133 134 $type_links['mine'] = sprintf( 135 '<option value="mine"%s>%s</option>', 136 selected( 'mine' === $filter, true, false ), 137 __( 'Mine' ) 138 ); 139 133 140 return $type_links; 134 141 } -
trunk/src/wp-admin/includes/post.php
r42875 r43056 1210 1210 if ( isset( $q['detached'] ) || ( isset( $q['attachment-filter'] ) && 'detached' == $q['attachment-filter'] ) ) { 1211 1211 $q['post_parent'] = 0; 1212 } 1213 1214 if ( isset( $q['mine'] ) || ( isset( $q['attachment-filter'] ) && 'mine' == $q['attachment-filter'] ) ) { 1215 $q['author'] = get_current_user_id(); 1212 1216 } 1213 1217 -
trunk/src/wp-includes/js/media-models.js
r42739 r43056 1122 1122 // are no filters for other properties, so observing will result in 1123 1123 // false positives in those queries. 1124 allowed = [ 's', 'order', 'orderby', 'posts_per_page', 'post_mime_type', 'post_parent' ];1124 allowed = [ 's', 'order', 'orderby', 'posts_per_page', 'post_mime_type', 'post_parent', 'author' ]; 1125 1125 if ( wp.Uploader && _( this.args ).chain().keys().difference( allowed ).isEmpty().value() ) { 1126 1126 this.observe( wp.Uploader.queue ); … … 1239 1239 */ 1240 1240 propmap: { 1241 'search': 's', 1242 'type': 'post_mime_type', 1243 'perPage': 'posts_per_page', 1244 'menuOrder': 'menu_order', 1245 'uploadedTo': 'post_parent', 1246 'status': 'post_status', 1247 'include': 'post__in', 1248 'exclude': 'post__not_in' 1241 'search': 's', 1242 'type': 'post_mime_type', 1243 'perPage': 'posts_per_page', 1244 'menuOrder': 'menu_order', 1245 'uploadedTo': 'post_parent', 1246 'status': 'post_status', 1247 'include': 'post__in', 1248 'exclude': 'post__not_in', 1249 'author': 'author' 1249 1250 }, 1250 1251 /** … … 1268 1269 * @param {Object} [props.post_parent] 1269 1270 * @param {Object} [props.post_status] 1271 * @param {Object} [props.author] 1270 1272 * @param {Object} [options] 1271 1273 * -
trunk/src/wp-includes/js/media-views.js
r42931 r43056 7252 7252 var type = this.model.get('type'), 7253 7253 types = wp.media.view.settings.mimeTypes, 7254 uid = window.userSettings ? parseInt( window.userSettings.uid, 10 ) : 0, 7254 7255 text; 7255 7256 … … 7264 7265 uploadedTo: null, 7265 7266 orderby: 'date', 7266 order: 'DESC' 7267 order: 'DESC', 7268 author: null 7267 7269 }, 7268 7270 priority: 10 … … 7274 7276 uploadedTo: wp.media.view.settings.post.id, 7275 7277 orderby: 'menuOrder', 7276 order: 'ASC' 7278 order: 'ASC', 7279 author: null 7277 7280 }, 7278 7281 priority: 20 … … 7284 7287 uploadedTo: 0, 7285 7288 orderby: 'menuOrder', 7286 order: 'ASC' 7289 order: 'ASC', 7290 author: null 7287 7291 }, 7288 7292 priority: 50 7289 7293 } 7290 7294 }; 7295 7296 if ( uid ) { 7297 this.filters.mine = { 7298 text: l10n.mine, 7299 props: { 7300 orderby: 'date', 7301 order: 'DESC', 7302 author: uid 7303 }, 7304 priority: 50 7305 }; 7306 } 7291 7307 } 7292 7308 }); … … 7315 7331 All = wp.media.view.AttachmentFilters.extend(/** @lends wp.media.view.AttachmentFilters.All.prototype */{ 7316 7332 createFilters: function() { 7317 var filters = {}; 7333 var filters = {}, 7334 uid = window.userSettings ? parseInt( window.userSettings.uid, 10 ) : 0; 7318 7335 7319 7336 _.each( wp.media.view.settings.mimeTypes || {}, function( text, key ) { … … 7325 7342 uploadedTo: null, 7326 7343 orderby: 'date', 7327 order: 'DESC' 7344 order: 'DESC', 7345 author: null 7328 7346 } 7329 7347 }; … … 7337 7355 uploadedTo: null, 7338 7356 orderby: 'date', 7339 order: 'DESC' 7357 order: 'DESC', 7358 author: null 7340 7359 }, 7341 7360 priority: 10 … … 7350 7369 uploadedTo: wp.media.view.settings.post.id, 7351 7370 orderby: 'menuOrder', 7352 order: 'ASC' 7371 order: 'ASC', 7372 author: null 7353 7373 }, 7354 7374 priority: 20 … … 7363 7383 type: null, 7364 7384 orderby: 'menuOrder', 7365 order: 'ASC' 7385 order: 'ASC', 7386 author: null 7366 7387 }, 7367 7388 priority: 50 7368 7389 }; 7390 7391 if ( uid ) { 7392 filters.mine = { 7393 text: l10n.mine, 7394 props: { 7395 status: null, 7396 type: null, 7397 uploadedTo: null, 7398 orderby: 'date', 7399 order: 'DESC', 7400 author: uid 7401 }, 7402 priority: 50 7403 }; 7404 } 7369 7405 7370 7406 if ( wp.media.view.settings.mediaTrash && … … 7378 7414 type: null, 7379 7415 orderby: 'date', 7380 order: 'DESC' 7416 order: 'DESC', 7417 author: null 7381 7418 }, 7382 7419 priority: 50 -
trunk/src/wp-includes/js/media/models/query.js
r41351 r43056 72 72 // are no filters for other properties, so observing will result in 73 73 // false positives in those queries. 74 allowed = [ 's', 'order', 'orderby', 'posts_per_page', 'post_mime_type', 'post_parent' ];74 allowed = [ 's', 'order', 'orderby', 'posts_per_page', 'post_mime_type', 'post_parent', 'author' ]; 75 75 if ( wp.Uploader && _( this.args ).chain().keys().difference( allowed ).isEmpty().value() ) { 76 76 this.observe( wp.Uploader.queue ); … … 189 189 */ 190 190 propmap: { 191 'search': 's', 192 'type': 'post_mime_type', 193 'perPage': 'posts_per_page', 194 'menuOrder': 'menu_order', 195 'uploadedTo': 'post_parent', 196 'status': 'post_status', 197 'include': 'post__in', 198 'exclude': 'post__not_in' 191 'search': 's', 192 'type': 'post_mime_type', 193 'perPage': 'posts_per_page', 194 'menuOrder': 'menu_order', 195 'uploadedTo': 'post_parent', 196 'status': 'post_status', 197 'include': 'post__in', 198 'exclude': 'post__not_in', 199 'author': 'author' 199 200 }, 200 201 /** … … 218 219 * @param {Object} [props.post_parent] 219 220 * @param {Object} [props.post_status] 221 * @param {Object} [props.author] 220 222 * @param {Object} [options] 221 223 * -
trunk/src/wp-includes/js/media/views/attachment-filters/all.js
r41351 r43056 15 15 All = wp.media.view.AttachmentFilters.extend(/** @lends wp.media.view.AttachmentFilters.All.prototype */{ 16 16 createFilters: function() { 17 var filters = {}; 17 var filters = {}, 18 uid = window.userSettings ? parseInt( window.userSettings.uid, 10 ) : 0; 18 19 19 20 _.each( wp.media.view.settings.mimeTypes || {}, function( text, key ) { … … 25 26 uploadedTo: null, 26 27 orderby: 'date', 27 order: 'DESC' 28 order: 'DESC', 29 author: null 28 30 } 29 31 }; … … 37 39 uploadedTo: null, 38 40 orderby: 'date', 39 order: 'DESC' 41 order: 'DESC', 42 author: null 40 43 }, 41 44 priority: 10 … … 50 53 uploadedTo: wp.media.view.settings.post.id, 51 54 orderby: 'menuOrder', 52 order: 'ASC' 55 order: 'ASC', 56 author: null 53 57 }, 54 58 priority: 20 … … 63 67 type: null, 64 68 orderby: 'menuOrder', 65 order: 'ASC' 69 order: 'ASC', 70 author: null 66 71 }, 67 72 priority: 50 68 73 }; 74 75 if ( uid ) { 76 filters.mine = { 77 text: l10n.mine, 78 props: { 79 status: null, 80 type: null, 81 uploadedTo: null, 82 orderby: 'date', 83 order: 'DESC', 84 author: uid 85 }, 86 priority: 50 87 }; 88 } 69 89 70 90 if ( wp.media.view.settings.mediaTrash && … … 78 98 type: null, 79 99 orderby: 'date', 80 order: 'DESC' 100 order: 'DESC', 101 author: null 81 102 }, 82 103 priority: 50 -
trunk/src/wp-includes/js/media/views/attachment-filters/uploaded.js
r41351 r43056 17 17 var type = this.model.get('type'), 18 18 types = wp.media.view.settings.mimeTypes, 19 uid = window.userSettings ? parseInt( window.userSettings.uid, 10 ) : 0, 19 20 text; 20 21 … … 29 30 uploadedTo: null, 30 31 orderby: 'date', 31 order: 'DESC' 32 order: 'DESC', 33 author: null 32 34 }, 33 35 priority: 10 … … 39 41 uploadedTo: wp.media.view.settings.post.id, 40 42 orderby: 'menuOrder', 41 order: 'ASC' 43 order: 'ASC', 44 author: null 42 45 }, 43 46 priority: 20 … … 49 52 uploadedTo: 0, 50 53 orderby: 'menuOrder', 51 order: 'ASC' 54 order: 'ASC', 55 author: null 52 56 }, 53 57 priority: 50 54 58 } 55 59 }; 60 61 if ( uid ) { 62 this.filters.mine = { 63 text: l10n.mine, 64 props: { 65 orderby: 'date', 66 order: 'DESC', 67 author: uid 68 }, 69 priority: 50 70 }; 71 } 56 72 } 57 73 }); -
trunk/src/wp-includes/media.php
r43054 r43056 3658 3658 'insertIntoPost' => $post_type_object->labels->insert_into_item, 3659 3659 'unattached' => __( 'Unattached' ), 3660 'mine' => __( 'Mine' ), 3660 3661 'trash' => _x( 'Trash', 'noun' ), 3661 3662 'uploadedToThisPost' => $post_type_object->labels->uploaded_to_this_item,
Note: See TracChangeset
for help on using the changeset viewer.