Fix two issues with the file picker provider.

contao · Jul 21, 2017 · 7655f00 · 7655f00
1 parent 3ddf78f
commit 7655f00
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/src/Picker/FilePickerProvider.php b/src/Picker/FilePickerProvider.php
@@ -131,9 +131,12 @@ public function getDcaAttributes(PickerConfig $config)
      */
     public function convertDcaValue(PickerConfig $config, $value)
     {
+        if ('file' === $config->getContext()) {
+            return $value;
+        }
+
         /** @var FilesModel $filesAdapter */
         $filesAdapter = $this->framework->getAdapter(FilesModel::class);
-
         $filesModel = $filesAdapter->findByPath(rawurldecode($value));
 
         if ($filesModel instanceof FilesModel) {

diff --git a/src/Resources/public/core.js b/src/Resources/public/core.js
@@ -977,7 +977,7 @@ var Backend =
 		Backend.openModalSelector({
 			'id': 'tl_listing',
 			'title': win.document.getElement('div.mce-title').get('text'),
-			'url': document.location.pathname.replace('/contao', '/_contao') + '/picker?context=' + (type == 'file' ? 'link' : 'file') + '&amp;value=' + url + '&amp;popup=1',
+			'url': document.location.pathname.replace('/contao', '/_contao') + '/picker?context=' + (type == 'file' ? 'link' : 'file') + '&amp;extras[fieldType]=radio&amp;extras[filesOnly]=true&amp;value=' + url + '&amp;popup=1',
 			'callback': function(table, value) {
 				win.document.getElementById(field_name).value = value.join(',');
 			}

diff --git a/src/Resources/public/core.min.js b/src/Resources/public/core.min.js
diff --git a/tests/Picker/FilePickerProviderTest.php b/tests/Picker/FilePickerProviderTest.php
@@ -327,13 +327,18 @@ public function testGetDcaAttributes()
     public function testConvertDcaValue()
     {
         $this->assertSame(
-            '{{file::82243f46-a4c3-11e3-8e29-000c29e44aea}}',
+            '/foobar',
             $this->provider->convertDcaValue(new PickerConfig('file'), '/foobar')
         );
 
+        $this->assertSame(
+            '{{file::82243f46-a4c3-11e3-8e29-000c29e44aea}}',
+            $this->provider->convertDcaValue(new PickerConfig('link'), '/foobar')
+        );
+
         $this->assertSame(
             '/foobar',
-            $this->provider->convertDcaValue(new PickerConfig('file'), '/foobar')
+            $this->provider->convertDcaValue(new PickerConfig('link'), '/foobar')
         );
     }
 }