diff --git a/.gitattributes b/.gitattributes index 36e5a51fa121dc113dccdfed7b755d427a65c485..5877a2ee2000543005d619b34dab5d9cc59cdbe3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3566,6 +3566,7 @@ public/opac/images/accessibilite_hover.png -text public/opac/images/box/menu/separ.gif -text public/opac/images/earth-logo.jpg -text svneol=unset#unset public/opac/images/flash-logo.jpg -text +public/opac/images/quicktime-logo.png -text svneol=unset#unset public/opac/images/read_speaker_listen.gif -text public/opac/images/reseaux/facebook.png -text svneol=unset#unset public/opac/images/reseaux/mail.png -text svneol=unset#unset diff --git a/library/Class/Album.php b/library/Class/Album.php index 11be7bfaad4030bc7b909462bea2092e1a2ee508..8c34dbc4a4e676a3e58dbea60deb7a156cb6d316 100644 --- a/library/Class/Album.php +++ b/library/Class/Album.php @@ -587,7 +587,8 @@ class Class_Album extends Storm_Model_Abstract { public function hasOnlyImages() { foreach($this->getRessources() as $ressource) if (!$ressource->isImage()) - return; + return false; + return true; } diff --git a/public/opac/images/quicktime-logo.png b/public/opac/images/quicktime-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..b42a241883f17740ba66d361385d700f1ded6c1c Binary files /dev/null and b/public/opac/images/quicktime-logo.png differ diff --git a/tests/application/modules/opac/controllers/BibNumeriqueControllerTest.php b/tests/application/modules/opac/controllers/BibNumeriqueControllerTest.php index c4a4251b1e3a791d68b4c6352435894eab9e263d..c869c3de4dbdb9e8eca14ba4894288fd704f43a5 100644 --- a/tests/application/modules/opac/controllers/BibNumeriqueControllerTest.php +++ b/tests/application/modules/opac/controllers/BibNumeriqueControllerTest.php @@ -44,8 +44,7 @@ abstract class AbstractBibNumeriqueControllerAlbumActionPremierVolumeTestCase ex public function setUp() { parent::setUp(); - $album = Class_Album::getLoader() - ->newInstanceWithId(999) + $album = Class_Album::newInstanceWithId(999) ->beDiaporama() ->setTitre('Premier volume') ->setDescription("On ne peut que reconnaitre le talent de l'artiste !") @@ -75,7 +74,7 @@ abstract class AbstractBibNumeriqueControllerAlbumActionPremierVolumeTestCase ex $album->setRessources(array($firstRessource, Class_AlbumRessource::getLoader() ->newInstanceWithId(2) - ->setFichier('2.pdf') + ->setFichier('2.jpg') ->setAlbum($album) ->setTitre('Procedure de numerisation') ->setLinkTo('http://wikipedia.org/numerisation') @@ -194,17 +193,32 @@ class BibNumeriqueControllerAlbumPremierVolumeTestToJSON extends AbstractBibNume $this->assertContains('/bib-numerique/thumbnail/width/200/crop_top/0/crop_right/10/crop_bottom/0/crop_left/0/id/2', $this->json->album->ressources[1]->thumbnail); } +} + + + + +class BibNumeriqueControllerAlbumPremierVolumeWithPDFTestToJSON extends AbstractBibNumeriqueControllerAlbumActionPremierVolumeTestCase { + public function setUp() { + parent::setUp(); + + Class_AlbumRessource::find(2)->setFichier('2.pdf'); + + $this->dispatch('/opac/bib-numerique/album/id/999.json', true); + $this->json = json_decode($this->_response->getBody()); + } /** @test */ - function secondRessourceNavigatorThumbnailShouldPassResizeParamsOfLeftPageCropRightTenWidth50() { - $this->assertContains(BASE_URL . '/public/opac/images/earth-logo.jpg', - $this->json->album->ressources[1]->navigator_thumbnail); + function secondRessourceNavigatorThumbnailShouldBeEarthLogoDotJpg() { + $this->assertContains(BASE_URL . '/public/opac/images/earth-logo.jpg', + $this->json->album->ressources[1]->navigator_thumbnail); } } + class BibNumeriqueControllerPermalinkTest extends AbstractBibNumeriqueControllerAlbumActionPremierVolumeTestCase { public function setUp() { parent::setUp(); diff --git a/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php b/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php index 024cdeafee5352010db71ca9fcb49e803943c7bf..2a6b9eb33e8a1154714f33d2eb820a134dfc8a86 100644 --- a/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php +++ b/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php @@ -161,14 +161,15 @@ class NoticeAjaxControllerResNumeriquesTest extends AbstractControllerTestCase { $album = Class_Album::getLoader() ->newInstanceWithId(8) - ->setTypeDocId(Class_TypeDoc::DIAPORAMA); + ->setTypeDocId(Class_TypeDoc::DIAPORAMA) + ->setRessources([]); Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Exemplaire') ->whenCalled('findFirstBy') ->with(array('id_notice' => 123)) ->answers($exemplaire); - $this->dispatch('noticeajax/resnumeriques?id_notice=123'); + $this->dispatch('noticeajax/resnumeriques?id_notice=123', true); $this->assertXPath('//script[contains(@src, "jquery.cycle.all")]'); }