From a0c11586e0ac21626bba023071b4767680c04823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Perr=C3=A9al?= <guillaume.perreal@irstea.fr>
Date: Mon, 26 Jan 2015 15:02:00 +0100
Subject: [PATCH] =?UTF-8?q?UploadedFile:=20propri=C3=A9t=C3=A9=20originalF?=
=?UTF-8?q?ilename=20renomm=C3=A9e=20en=20displayName.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Controller/UploadController.php | 3 ++-
Entity/Repository/UploadedFileRepository.php | 2 +-
Entity/UploadedFile.php | 12 ++++++------
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Controller/UploadController.php b/Controller/UploadController.php
index f9ebe05f..61070625 100644
--- a/Controller/UploadController.php
+++ b/Controller/UploadController.php
@@ -153,9 +153,10 @@ class UploadController extends Controller
'files' => [
[
'id' => $file->getId(),
- 'name' => $file->getOriginalFilename(),
+ 'name' => $file->getDisplayName(),
'type' => $file->getMimeType(),
'size' => $file->getSize(),
+ 'icon' => MimeTypeIcon::getMimeTypeIcon($file->getMimeType()),
'url' => $this->router->generate('file_upload_get_content', $parameters),
'delete_type' => 'DELETE',
'delete_url' => $this->router->generate('file_upload_delete', $parameters),
diff --git a/Entity/Repository/UploadedFileRepository.php b/Entity/Repository/UploadedFileRepository.php
index ebdce320..a4e8db8e 100644
--- a/Entity/Repository/UploadedFileRepository.php
+++ b/Entity/Repository/UploadedFileRepository.php
@@ -60,7 +60,7 @@ class UploadedFileRepository extends EntityRepository implements FileManagerInte
$file
->setFilesystem($this->filesystem)
- ->setOriginalFilename($filename)
+ ->setDisplayName($filename)
->setMetadata(
[
'original' => [
diff --git a/Entity/UploadedFile.php b/Entity/UploadedFile.php
index 8e774879..223c2b48 100644
--- a/Entity/UploadedFile.php
+++ b/Entity/UploadedFile.php
@@ -40,7 +40,7 @@ class UploadedFile
* @ORM\Column(type="string", length=1024)
* @var string
*/
- private $originalFilename;
+ private $displayName;
/**
* @ORM\Column(type="string", length=1024)
@@ -113,12 +113,12 @@ class UploadedFile
/**
* Set originalFilename
*
- * @param string $originalFilename
+ * @param string $displayName
* @return UploadedFile
*/
- public function setOriginalFilename($originalFilename)
+ public function setDisplayName($displayName)
{
- $this->originalFilename = $originalFilename;
+ $this->displayName = $displayName;
return $this;
}
@@ -128,9 +128,9 @@ class UploadedFile
*
* @return string
*/
- public function getOriginalFilename()
+ public function getDisplayName()
{
- return $this->originalFilename;
+ return $this->displayName;
}
/**
--
GitLab