Use absolute path for dragText with parent #2003

getkirby · Sep 16, 2019 · 2256afd · 2256afd
1 parent 9a25f40
commit 2256afd
Show file tree

Hide file tree

Showing 10 changed files with 138 additions and 24 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,15 @@
             [
                 '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) {
+                        $absolute = $field->model()->is($parent) === false;
+
                         return [
                             'filename' => $file->filename(),
-                            'dragText' => $file->dragText(),
+                            'dragText' => $file->dragText($absolute),
                         ];
                     });
                 }

diff --git a/config/sections/files.php b/config/sections/files.php
@@ -70,9 +70,6 @@
 
             return null;
         },
-        'dragTextType' => function () {
-            return (option('panel.kirbytext') ?? true) ? 'kirbytext' : 'markdown';
-        },
         'parent' => function () {
             return $this->parentModel();
         },
@@ -104,7 +101,7 @@
                 $image = $file->panelImage($this->image);
 
                 $data[] = [
-                    'dragText' => $file->dragText($this->dragTextType, $dragTextAbsolute),
+                    'dragText' => $file->dragText($dragTextAbsolute),
                     'filename' => $file->filename(),
                     'id'       => $file->id(),
                     'text'     => $file->toString($this->text),

diff --git a/config/sections/pages.php b/config/sections/pages.php
@@ -79,9 +79,6 @@
         }
     ],
     'computed' => [
-        'dragTextType' => function () {
-            return option('panel.kirbytext', true) ? 'kirbytext' : 'markdown';
-        },
         'parent' => function () {
             return $this->parentModel();
         },
@@ -144,7 +141,7 @@
 
                 $data[] = [
                     'id'          => $item->id(),
-                    'dragText'    => $item->dragText($this->dragTextType),
+                    'dragText'    => $item->dragText(),
                     'text'        => $item->toString($this->text),
                     'info'        => $item->toString($this->info ?? false),
                     'parent'      => $item->parentId(),

diff --git a/src/Cms/File.php b/src/Cms/File.php
@@ -232,13 +232,13 @@ public function contentFileName(): string
      * gets dragged onto a textarea
      *
      * @internal
-     * @param string $type
      * @param bool $absolute
      * @return string
      */
-    public function dragText($type = 'kirbytext', bool $absolute = false): string
+    public function dragText(bool $absolute = false): string
     {
-        $url = $absolute ? $this->id() : $this->filename();
+        $type = option('panel.kirbytext', true) ? 'kirbytext' : 'markdown';
+        $url  = $absolute ? $this->id() : $this->filename();
 
         switch ($type) {
             case 'kirbytext':

diff --git a/src/Cms/Page.php b/src/Cms/Page.php
@@ -407,8 +407,10 @@ public function diruri(): string
      * @internal
      * @return string
      */
-    public function dragText($type = 'kirbytext'): string
+    public function dragText(): string
     {
+        $type = option('panel.kirbytext', true) ? 'kirbytext' : 'markdown';
+
         switch ($type) {
             case 'kirbytext':
                 return '(link: ' . $this->id() . ' text: ' . $this->title() . ')';

diff --git a/tests/Cms/Files/FileTest.php b/tests/Cms/Files/FileTest.php
@@ -62,9 +62,36 @@ public function testDragText()
         ]);
 
         $file = $page->file('test.pdf');
-
         $this->assertEquals('(file: test.pdf)', $file->dragText());
-        $this->assertEquals('[test.pdf](test.pdf)', $file->dragText('markdown'));
+    }
+
+    public function testDragTextMarkdown()
+    {
+        $app = new App([
+            'roots' => [
+                'index' => '/dev/null'
+            ],
+            'options' => [
+                'panel' => [
+                    'kirbytext' => false
+                ]
+            ],
+            'site' => [
+                'children' => [
+                    [
+                        'slug' => 'test',
+                        'files' => [
+                            [
+                                'filename' => 'test.pdf'
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ]);
+
+        $file = $app->page('test')->file('test.pdf');
+        $this->assertEquals('[test.pdf](test.pdf)', $file->dragText());
     }
 
     public function testDragTextForImages()
@@ -79,9 +106,36 @@ public function testDragTextForImages()
         ]);
 
         $file = $page->file('test.jpg');
-
         $this->assertEquals('(image: test.jpg)', $file->dragText());
-        $this->assertEquals('![](test.jpg)', $file->dragText('markdown'));
+    }
+
+    public function testDragTextForImagesMarkdown()
+    {
+        $app = new App([
+            'roots' => [
+                'index' => '/dev/null'
+            ],
+            'options' => [
+                'panel' => [
+                    'kirbytext' => false
+                ]
+            ],
+            'site' => [
+                'children' => [
+                    [
+                        'slug' => 'test',
+                        'files' => [
+                            [
+                                'filename' => 'test.jpg'
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ]);
+
+        $file = $app->page('test')->file('test.jpg');
+        $this->assertEquals('![](test.jpg)', $file->dragText());
     }
 
     public function testFilename()

diff --git a/tests/Cms/Pages/PageTest.php b/tests/Cms/Pages/PageTest.php
@@ -129,7 +129,30 @@ public function testDragText()
         ]);
 
         $this->assertEquals('(link: test text: test)', $page->dragText());
-        $this->assertEquals('[test](/test)', $page->dragText('markdown'));
+    }
+
+    public function testDragTextMarkdown()
+    {
+        $app = new App([
+            'roots' => [
+                'index' => '/dev/null'
+            ],
+            'options' => [
+                'panel' => [
+                    'kirbytext' => false
+                ]
+            ],
+            'site' => [
+                'children' => [
+                    [
+                        'slug' => 'test'
+                    ]
+                ]
+            ]
+        ]);
+
+        $page = $app->page('test');
+        $this->assertEquals('[test](/test)', $page->dragText());
     }
 
     public function testDragTextWithTitle()
@@ -142,7 +165,33 @@ public function testDragTextWithTitle()
         ]);
 
         $this->assertEquals('(link: test text: Test Title)', $page->dragText());
-        $this->assertEquals('[Test Title](/test)', $page->dragText('markdown'));
+    }
+
+    public function testDragTextWithTitleMarkdown()
+    {
+        $app = new App([
+            'roots' => [
+                'index' => '/dev/null'
+            ],
+            'options' => [
+                'panel' => [
+                    'kirbytext' => false
+                ]
+            ],
+            'site' => [
+                'children' => [
+                    [
+                        'slug' => 'test',
+                        'content' => [
+                            'title' => 'Test Title'
+                        ]
+                    ]
+                ]
+            ]
+        ]);
+
+        $page = $app->page('test');
+        $this->assertEquals('[Test Title](/test)', $page->dragText());
     }
 
     public function testId()

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', [