diff --git a/library/ZendAfi/View/Helper/AlbumRessourceInfos.php b/library/ZendAfi/View/Helper/AlbumRessourceInfos.php index d635ee66f5babba9c3b7e92b91868c6bbd2864a7..900cab6dc011f560f08617ddf1aefaf854c9b8fd 100644 --- a/library/ZendAfi/View/Helper/AlbumRessourceInfos.php +++ b/library/ZendAfi/View/Helper/AlbumRessourceInfos.php @@ -22,9 +22,14 @@ class ZendAfi_View_Helper_AlbumRessourceInfos extends Zend_View_Helper_HtmlElement { public function albumRessourceInfos($ressource) { $file_info = new Class_File_Info($ressource->getOriginalPath()); + + $description = $file_info->fileExtension(); + if ($size = $file_info->fileSize()) + $description .=', '.$this->view->memoryFormat($size); + return $ressource->findTitle() .'<br/>' - .'['.$file_info->fileExtension().', '.$this->view->memoryFormat($file_info->fileSize()).']'; + .'['.$description.']'; } } diff --git a/library/ZendAfi/View/Helper/FileInfos.php b/library/ZendAfi/View/Helper/FileInfos.php index 6df62644d8020eea86bd56fedfd744e27cbac0d8..d65c97ac7b4fe4b33b84ae35b711b38ec42e4ca9 100644 --- a/library/ZendAfi/View/Helper/FileInfos.php +++ b/library/ZendAfi/View/Helper/FileInfos.php @@ -25,7 +25,11 @@ class ZendAfi_View_Helper_FileInfos extends Zend_View_Helper_Abstract { */ public function fileInfos($path) { $file_info = new Class_File_Info($path); - return $file_info->fileNameWithExtension().', '.$this->view->memoryFormat($file_info->fileSize()); + + $description = $file_info->fileNameWithExtension(); + if ($size = $file_info->fileSize()) + $description .=', '.$this->view->memoryFormat($size); + return $description; } } ?> \ No newline at end of file diff --git a/tests/application/modules/opac/controllers/RechercheControllerAlbumAudioRecordTest.php b/tests/application/modules/opac/controllers/RechercheControllerAlbumAudioRecordTest.php index 7f2372aaa094ec89fe99f6634e0ab9443a85d6b7..0540887906c68c667ad9e709991be06292589fff 100644 --- a/tests/application/modules/opac/controllers/RechercheControllerAlbumAudioRecordTest.php +++ b/tests/application/modules/opac/controllers/RechercheControllerAlbumAudioRecordTest.php @@ -252,9 +252,9 @@ class RechercheControllerAlbumAudioRecordViewRessourcesNumeriquesTest extends Re /** @test **/ - public function liForUnknownShouldBeFileNameUnknownMp3ZeroBite() { + public function liForUnknownShouldBeFileNameUnknownMp3() { $this->assertXPathContentContains('//ol//li', 'Unknown'); - $this->assertXPathContentContains('//ol//li', '[mp3, 0 o]'); + $this->assertXPathContentContains('//ol//li', '[mp3]'); }