Use absolute path for dragText with parent #2003

getkirby · Sep 14, 2019 · 6b2157a · 6b2157a
1 parent 9bb2a44
commit 6b2157a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/config/fields/files.php b/config/fields/files.php
@@ -112,7 +112,7 @@
                     $field   = $this->field();
                     $uploads = $field->uploads();
 
-                    return $field->upload($this, $uploads, function ($file) use ($field) {
+                    return $field->upload($this, $uploads, function ($file, $parent) use ($field) {
                         return $file->panelPickerData([
                             'image' => $field->image(),
                             'info'  => $field->info(),

diff --git a/config/fields/mixins/upload.php b/config/fields/mixins/upload.php
@@ -64,7 +64,7 @@
                     throw new Exception('The file could not be uploaded');
                 }
 
-                return $map($file);
+                return $map($file, $parent);
             });
         }
     ]

diff --git a/config/fields/textarea.php b/config/fields/textarea.php
@@ -95,10 +95,17 @@
             [
                 'pattern' => 'upload',
                 'action' => function () {
-                    return $this->field()->upload($this, $this->field()->uploads(), function ($file) {
+                    $field   = $this->field();
+                    $uploads = $field->uploads();
+
+                    return $this->field()->upload($this, $uploads, function ($file, $parent) use ($field) {
+
+                        $dragTextType = (option('panel.kirbytext') ?? true) ? 'kirbytext' : 'markdown';
+                        $dragTextAbsolute = $field->model()->is($parent) === false;
+
                         return [
                             'filename' => $file->filename(),
-                            'dragText' => $file->dragText(),
+                            'dragText' => $file->dragText($dragTextType, $dragTextAbsolute),
                         ];
                     });
                 }

diff --git a/tests/Form/Fields/TextareaFieldTest.php b/tests/Form/Fields/TextareaFieldTest.php
@@ -2,8 +2,6 @@
 
 namespace Kirby\Form\Fields;
 
-use Kirby\Form\Field;
-
 class TextareaFieldTest extends TestCase
 {
     public function testDefaultProps()
@@ -129,6 +127,18 @@ public function testUploadsDisabled()
         $this->assertFalse($field->uploads());
     }
 
+    public function testUploadsParent()
+    {
+        $field = $this->field('textarea', [
+            'value' => 'test',
+            'uploads' => [
+                'parent' => 'page.parent'
+            ]
+        ]);
+
+        $this->assertEquals(['parent' => 'page.parent', 'accept' => '*'], $field->uploads());
+    }
+
     public function testUploadsTemplate()
     {
         $field = $this->field('textarea', [