Fix the inconsistencies between allowed media types and allowed file extensions [#1289900]

Currently on File field setting forms, we have both 'Allowed media types' and 'Allowed file extensions'. These settings conflict with each other. We discussed changing this into a radios with three different options:

( ) Allowed file types
  [ ] Audio
  [ ] Image
  [ ] Video

( ) Allowed file mime types
  [ text field to enter a space-separated list of mime types ]

( ) Allowed file extensions
  [ text field to enter a space-separated list of file extensions ]

Selecting either an option in allowed file types or file mime options should automatically pre-fill in the list of allowed file extensions since we need to ensure that the file_extensions instance setting is always available (to allow people to switch back to alternate widgets).

We then need to ensure that we properly validate against these options in the media browser. Also, these options should validate so that *something* underneath the selected radio button is also selected. For example, the user cannot select 'Allow specific file types' and not click one of the file type checkboxes. Or select 'Allow specific file extensions' and not enter any extensions in the text field.

Comment	File	Size	Author
#21	fix-inconsistencies-1289900-20.patch	4.53 KB	aaron
#13	better-descriptions-for-field-settings-1289900-13.patch	3.53 KB	shawn dearmond
#12	Edit Page A test \| Media-1.png	161.69 KB	Anonymous (not verified)
#12	Edit Page A test \| Media-2.png	97.46 KB	Anonymous (not verified)
#12	Field info \| Media.png	93.13 KB	Anonymous (not verified)
#6	better-descriptions-for-field-settings-1289900-6.patch	3.26 KB	aaron
#4	better-descriptions-for-field-settings-1289900-4.patch	2.11 KB	aaron
#3	better-descriptions-for-field-settings-1289900-3.patch	0 bytes	aaron
#2	allowed-types-1289900-2.patch	2.95 KB	Anonymous (not verified)

Comments

Comment #1

Anonymous (not verified) commented 24 September 2011 at 19:41

Assigned:

Unassigned

Comment #2

Anonymous (not verified) commented 24 September 2011 at 22:51

Assigned:		» Unassigned
Status:	Active	» Needs work

Status	File	Size
new	allowed-types-1289900-2.patch	2.95 KB

This patch here is a work in progress... but working on it forced an issue about the utility of mapping broad mime types to file extensions, so this work is somewhat abandoned.

Comment #3

aaron commented 25 September 2011 at 18:05

Status:

Needs work

» Needs review

Status	File	Size
new	better-descriptions-for-field-settings-1289900-3.patch	0 bytes

this one grabs the titles & descriptions for allowed extensions & allowed media types. applies to file field & image field as well.

Comment #4

aaron commented 25 September 2011 at 18:12

Status	File	Size
new	better-descriptions-for-field-settings-1289900-4.patch	2.11 KB

oops, empty patch. here we go again!

Comment #5

dave reid

he/him

English

Nebraska USA

commented 25 September 2011 at 18:18

Status:

Needs review

» Needs work

+++ b/includes/media.fields.incundefined
@@ -187,13 +187,13 @@ function media_field_widget_settings_form($field, $instance) {
-    '#title' => t('Allowed media types'),
+    '#title' => t('Allowed remote media types'),
     '#options' => $options,
     '#default_value' => $settings['allowed_types'],
-    '#description' => t('Media types which are allowed for this field'),
+    '#description' => t('Select any remote media types which are allowed for this field. Checking these boxes have no effect unless there are remote sites also checked in the Allowed URI schemes section below.'),
     '#weight' => 1,

I'm thinking our description for this field (pre and post-patch) is redundant and really doesn't provide good description aside from the note about the Allowed URI schemes.

+++ b/includes/media.fields.incundefined
@@ -187,13 +187,13 @@ function media_field_widget_settings_form($field, $instance) {
-
+  ¶

Adding a line with trailing spaces here.

+++ b/media.moduleundefined
@@ -528,12 +528,16 @@ function media_form_field_ui_field_edit_form_alter(&$form, &$form_state) {
+    $form['instance']['settings']['file_extensions']['#title'] = t('Allowed local file extensions');
+    $form['instance']['settings']['file_extensions']['#description'] .= t(' This setting applies only to files uploaded to a local stream.');
   }
 
   // On image fields using the media widget we remove the alt/title fields
   if ($form['#field']['type'] == 'image' && $form['instance']['widget']['type']['#value'] == 'media_generic') {
     $form['instance']['settings']['alt_field']['#access'] = FALSE;
     $form['instance']['settings']['title_field']['#access'] = FALSE;
+    $form['instance']['settings']['file_extensions']['#title'] = t('Allowed local file extensions');
+    $form['instance']['settings']['file_extensions']['#description'] .= t(' This setting applies only to files uploaded to a local stream.');
   }

I'd probably just change the title to 'Allowed file extensions for uploaded files' and then we probably don't even need to add an additional description.

Comment #6

aaron commented 25 September 2011 at 20:01

Status:

Needs work

» Needs review

Status	File	Size
new	better-descriptions-for-field-settings-1289900-6.patch	3.26 KB

this also includes an allowed uploaded file exts. field for media fields.

Comment #7

aaron commented 25 September 2011 at 20:09

Assigned:

Unassigned

» aaron

Comment #8

dave reid

he/him

English

Nebraska USA

commented 25 September 2011 at 20:20

On patch review this looks good! Could use someone manually testing it.

Comment #9

Anonymous (not verified) commented 25 September 2011 at 20:45

I'm getting these warnings when i try to create a node with a media reference field:

Notice: Undefined index: file_directory in media_field_widget_form() (line 269 of /Users/bjd/workspace/drupal-7/sites/media.7/modules/media/includes/media.fields.inc).
Notice: Undefined index: file_extensions in media_field_widget_form() (line 270 of /Users/bjd/workspace/drupal-7/sites/media.7/modules/media/includes/media.fields.inc).
Notice: Undefined index: max_filesize in media_field_widget_form() (line 271 of /Users/bjd/workspace/drupal-7/sites/media.7/modules/media/includes/media.fields.inc).

Comment #10

aaron commented 25 September 2011 at 20:46

Status:

Needs review

» Needs work

me too... :(

Comment #11

aaron commented 25 September 2011 at 20:56

Status:

Needs work

» Needs review

actually, i get that error even w/o applying this patch.

Comment #12

Anonymous (not verified) commented 25 September 2011 at 20:58

Status:

Needs review

» Needs work

Status	File	Size
new	Field info \| Media.png	93.13 KB
new	Edit Page A test \| Media-2.png	97.46 KB
new	Edit Page A test \| Media-1.png	161.69 KB

There are some other bugs that are breaking the media reference field. I can select an item from the library for the field, but I can't upload a file with the same extension.