Changeset 23072

Timestamp:

12/05/2012 10:29:24 AM (14 years ago)

Author:

markjaquith

Message:

Intelligently make media fields readonly when the user cannot update or do anything with them. props koopersmith, helenyhou, nacin. fixes #22613

Location:

trunk

Files:

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

trunk/wp-admin/includes/media.php

@@ -1291 +1291 @@
         );
 
+        $user_can_edit = current_user_can( 'edit_post', $attachment_id );
+
         $args = wp_parse_args( $args, $default_args );
         $args = apply_filters( 'get_media_item_args', $args );
@@ -1315 +1317 @@
                                 $values[] = $term->slug;
                         $t['value'] = join(', ', $values);
+                        $t['taxonomy'] = true;
 
                         $form_fields[$taxonomy] = $t;
@@ -1364 +1367 @@
                 }
 
+                $readonly      = ! $user_can_edit && ! empty( $field['taxonomy'] ) ? " readonly='readonly' " : '';
                 $required      = $field['required'] ? '<span class="alignright"><abbr title="required" class="required">*</abbr></span>' : '';
                 $aria_required = $field['required'] ? " aria-required='true' " : '';
@@ -1382 +1386 @@
                         $item .= "<textarea id='$id_attr' name='$name' $aria_required>" . $field['value'] . '</textarea>';
                 } else {
-                        $item .= "<input type='text' class='text' id='$id_attr' name='$name' value='" . esc_attr( $field['value'] ) . "' $aria_required />";
+                        $item .= "<input type='text' class='text' id='$id_attr' name='$name' value='" . esc_attr( $field['value'] ) . "' $readonly $aria_required />";
                 }
                 if ( !empty( $field['helps'] ) )

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

@@ -1544 +1544 @@
                                         editable:   true,
 
+                                        // If the user isn't allowed to edit fields,
+                                        // can they still edit it locally?
+                                        allowLocalEdits: true,
+
                                         // Show the attachment display settings.
                                         displaySettings: true,
@@ -2841 +2845 @@
                         }
 
+                        if ( this.controller.state().get('allowLocalEdits') )
+                                options.allowLocalEdits = true;
+
                         this.views.detach();
                         this.$el.html( this.template( options ) );

trunk/wp-includes/media.php

@@ -1659 +1659 @@
                         <# } #>
                 </div>
-                <# if ( data.describe ) { #>
+                <#
+                var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly';
+                if ( data.describe ) { #>
                         <# if ( 'image' === data.type ) { #>
                                 <input type="text" value="{{ data.caption }}" class="describe" data-setting="caption"
-                                        placeholder="<?php esc_attr_e('Describe this image&hellip;'); ?>" />
+                                        placeholder="<?php esc_attr_e('Describe this image&hellip;'); ?>" {{ maybeReadOnly }} />
                         <# } else { #>
                                 <input type="text" value="{{ data.title }}" class="describe" data-setting="title"
@@ -1671 +1673 @@
                                         <# } else { #>
                                                 placeholder="<?php esc_attr_e('Describe this media file&hellip;'); ?>"
-                                        <# } #> />
+                                        <# } #> {{ maybeReadOnly }} />
                         <# } #>
                 <# } #>
@@ -1714 +1716 @@
                 </div>
 
-                <# if ( 'image' === data.type ) { #>
+                <#
+                var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly';
+                if ( 'image' === data.type ) { #>
                         <label class="setting" data-setting="title">
                                 <span><?php _e('Title'); ?></span>
-                                <input type="text" value="{{ data.title }}" />
+                                <input type="text" value="{{ data.title }}" {{ maybeReadOnly }} />
                         </label>
                         <label class="setting" data-setting="caption">
                                 <span><?php _e('Caption'); ?></span>
-                                <textarea
+                                <textarea {{ maybeReadOnly }}
                                         placeholder="<?php esc_attr_e('Describe this image&hellip;'); ?>"
                                         >{{ data.caption }}</textarea>
@@ -1727 +1731 @@
                         <label class="setting" data-setting="alt">
                                 <span><?php _e('Alt Text'); ?></span>
-                                <input type="text" value="{{ data.alt }}" />
+                                <input type="text" value="{{ data.alt }}" {{ maybeReadOnly }} />
                         </label>
                 <# } else { #>
                         <label class="setting" data-setting="title">
                                 <span><?php _e('Title'); ?></span>
-                                <input type="text" value="{{ data.title }}"
+                                <input type="text" value="{{ data.title }}" {{ maybeReadOnly }}
                                 <# if ( 'video' === data.type ) { #>
                                         placeholder="<?php esc_attr_e('Describe this video&hellip;'); ?>"