Return path attribute for ajax rename operations

This fixes an issue when renaming files from a flat list view like
"Favorites" or "Shared with you", in which case the path needs to be
present in the response to make sure the data-path attribute is properly
set in the JS side.

diff --git a/apps/files/lib/app.php b/apps/files/lib/app.php
index e1aeb4d42238108419245236992b5096316846f4..47d0ec9be9df52ba1fce86a082df9c1bf3a8050e 100644 (file)
--- a/apps/files/lib/app.php
+++ b/apps/files/lib/app.php
@@ -106,6 +106,7 @@ class App {
                        $meta = $this->view->getFileInfo($normalizedNewPath);
                        $meta = \OCA\Files\Helper::populateTags(array($meta));
                        $fileInfo = \OCA\Files\Helper::formatFileInfo(current($meta));
+                       $fileInfo['path'] = dirname($normalizedNewPath);
                        $result['success'] = true;
                        $result['data'] = $fileInfo;
                } else {

diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
index 2ffba19e54bedc8be44a6ebeabe05798df7678c9..488c741d3f67e7ca8ebd119090bdc1c99359cd17 100644 (file)
--- a/apps/files/tests/ajax_rename.php
+++ b/apps/files/tests/ajax_rename.php
@@ -118,6 +118,7 @@ class Test_OC_Files_App_Rename extends \Test\TestCase {
                $this->assertEquals('httpd/unix-directory', $result['data']['mimetype']);
                $this->assertEquals('abcdef', $result['data']['etag']);
                $this->assertFalse(isset($result['data']['tags']));
+               $this->assertEquals('/', $result['data']['path']);
                $icon = \OC_Helper::mimetypeIcon('dir');
                $icon = substr($icon, 0, -3) . 'svg';
                $this->assertEquals($icon, $result['data']['icon']);
@@ -182,6 +183,7 @@ class Test_OC_Files_App_Rename extends \Test\TestCase {
                $this->assertEquals('text/plain', $result['data']['mimetype']);
                $this->assertEquals('abcdef', $result['data']['etag']);
                $this->assertEquals(array('tag1', 'tag2'), $result['data']['tags']);
+               $this->assertEquals('/', $result['data']['path']);
                $icon = \OC_Helper::mimetypeIcon('text');
                $icon = substr($icon, 0, -3) . 'svg';
                $this->assertEquals($icon, $result['data']['icon']);