diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-20 15:25:36 +0300 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-20 15:25:36 +0300 |
| commit | 899165113caad413a9698bbfcf0c99e26e766400 (patch) | |
| tree | 174d6d37533b82dcceaea775c3d861d81e2c66a4 /apps/files | |
| parent | 1a84c8e9d28ff153996dcb6e97fe4115ca038028 (diff) | |
| parent | 5e9ca79788fba962418865c0431d25a0a2dc89f7 (diff) | |
Merge pull request #19742 from owncloud/shareinfo_performance
Do not calculate non essential info
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/lib/helper.php | 2 | ||||
| -rw-r--r-- | apps/files/tests/ajax_rename.php | 6 | ||||
| -rw-r--r-- | apps/files/tests/controller/apicontrollertest.php | 6 |
3 files changed, 0 insertions, 14 deletions
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php index 6bfdc0a095c..fb14cea731f 100644 --- a/apps/files/lib/helper.php +++ b/apps/files/lib/helper.php @@ -137,10 +137,8 @@ class Helper { $entry['id'] = $i['fileid']; $entry['parentId'] = $i['parent']; - $entry['date'] = \OCP\Util::formatDate($i['mtime']); $entry['mtime'] = $i['mtime'] * 1000; // only pick out the needed attributes - $entry['icon'] = \OCA\Files\Helper::determineIcon($i); if (\OC::$server->getPreviewManager()->isAvailable($i)) { $entry['isPreviewAvailable'] = true; } diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php index 45d49c9549d..00a62fa002d 100644 --- a/apps/files/tests/ajax_rename.php +++ b/apps/files/tests/ajax_rename.php @@ -117,9 +117,6 @@ class Test_OC_Files_App_Rename extends \Test\TestCase { $this->assertEquals('abcdef', $result['data']['etag']); $this->assertFalse(isset($result['data']['tags'])); $this->assertEquals('/', $result['data']['path']); - $icon = \OC_Helper::mimetypeIcon('dir-external'); - $icon = substr($icon, 0, -3) . 'svg'; - $this->assertEquals($icon, $result['data']['icon']); } /** @@ -182,9 +179,6 @@ class Test_OC_Files_App_Rename extends \Test\TestCase { $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']); \OC::$server->registerService('TagManager', function ($c) use ($oldTagManager) { return $oldTagManager; diff --git a/apps/files/tests/controller/apicontrollertest.php b/apps/files/tests/controller/apicontrollertest.php index 35d00af75ba..7f34c0a5642 100644 --- a/apps/files/tests/controller/apicontrollertest.php +++ b/apps/files/tests/controller/apicontrollertest.php @@ -110,9 +110,7 @@ class ApiControllerTest extends TestCase { [ 'id' => null, 'parentId' => null, - 'date' => \OCP\Util::formatDate(55), 'mtime' => 55000, - 'icon' => \OCA\Files\Helper::determineIcon($fileInfo), 'name' => 'root.txt', 'permissions' => null, 'mimetype' => 'application/pdf', @@ -175,9 +173,7 @@ class ApiControllerTest extends TestCase { [ 'id' => null, 'parentId' => null, - 'date' => \OCP\Util::formatDate(55), 'mtime' => 55000, - 'icon' => \OCA\Files\Helper::determineIcon($fileInfo1), 'name' => 'root.txt', 'permissions' => null, 'mimetype' => 'application/pdf', @@ -194,9 +190,7 @@ class ApiControllerTest extends TestCase { [ 'id' => null, 'parentId' => null, - 'date' => \OCP\Util::formatDate(999), 'mtime' => 999000, - 'icon' => \OCA\Files\Helper::determineIcon($fileInfo2), 'name' => 'root.txt', 'permissions' => null, 'mimetype' => 'application/binary', |