Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2046809 by larowlan, quicksketch: Fixed UUIDs not added when file uploaded using managed_file() FAPI element.

8.0.x
Alex Pott 2013-07-25 16:05:21 +02:00
parent d88a2be443
commit 337b3709b1
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/file/lib/Drupal/file/FileStorageController.php
View File

@ -52,7 +52,7 @@ class FileStorageController extends DatabaseStorageControllerNG implements FileS
$properties['uuid'] = array( $properties['uuid'] = array(
'label' => t('UUID'), 'label' => t('UUID'),
'description' => t('The file UUID.'), 'description' => t('The file UUID.'),
'type' => 'string_field', 'type' => 'uuid_field',
'read-only' => TRUE, 'read-only' => TRUE,
); );
$properties['langcode'] = array( $properties['langcode'] = array(

19
core/modules/file/lib/Drupal/file/Tests/LoadTest.php
View File

@ -88,4 +88,23 @@ class LoadTest extends FileManagedTestBase {
$this->assertTrue($by_fid_file->file_test['loaded'], 'file_test_file_load() was able to modify the file during load.'); $this->assertTrue($by_fid_file->file_test['loaded'], 'file_test_file_load() was able to modify the file during load.');
$this->assertEqual($by_fid_file->getFileUri(), $file->getFileUri(), 'Loading by fid got the correct filepath.', 'File'); $this->assertEqual($by_fid_file->getFileUri(), $file->getFileUri(), 'Loading by fid got the correct filepath.', 'File');
} }
/**
* Loads a single file and ensure that the correct values are returned.
*/
public function testUuidValues() {
// Create a new file entity from scratch so we know the values.
$file = $this->createFile('druplicon.txt', NULL, 'public');
$file->save();
file_test_reset();
$by_uuid_file = entity_load_by_uuid('file', $file->uuid());
$this->assertFileHookCalled('load');
$this->assertTrue(is_object($by_uuid_file), 'entity_load_by_uuid() returned a file object.');
if (is_object($by_uuid_file)) {
$this->assertEqual($by_uuid_file->id(), $file->id(), 'Loading by UUID got the same fid.', 'File');
$this->assertTrue($by_uuid_file->file_test['loaded'], 'file_test_file_load() was able to modify the file during load.');
}
}
} }