- |
+ |
{{record.get_collection_logo(app)|raw}}
|
{% set l_width = 30 %}
diff --git a/tests/Alchemy/Phrasea/Application/ApiAbstract.inc b/tests/Alchemy/Phrasea/Application/ApiAbstract.inc
index ac5c45091e..5e1a025372 100644
--- a/tests/Alchemy/Phrasea/Application/ApiAbstract.inc
+++ b/tests/Alchemy/Phrasea/Application/ApiAbstract.inc
@@ -729,7 +729,7 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract
foreach ($content['response']['termsOfUse'] as $terms) {
$this->assertTrue(is_array($terms), 'Une bloc cgu est un objet');
$this->assertArrayHasKey('locale', $terms);
- $this->assertTrue(in_array($terms['locale'], array('fr_FR', 'en_GB', 'ar_SA', 'de_DE', 'es_ES')));
+ $this->assertTrue(in_array($terms['locale'], array('fr_FR', 'nl_NL', 'en_GB', 'ar_SA', 'de_DE', 'es_ES')));
$this->assertArrayHasKey('terms', $terms);
}
}
diff --git a/tests/Alchemy/Phrasea/Application/OverviewTest.php b/tests/Alchemy/Phrasea/Application/OverviewTest.php
index 55a7971c81..7f804cf357 100644
--- a/tests/Alchemy/Phrasea/Application/OverviewTest.php
+++ b/tests/Alchemy/Phrasea/Application/OverviewTest.php
@@ -2,8 +2,8 @@
require_once __DIR__ . '/../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-use Symfony\Component\Filesystem\Filesystem;
-use \Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpKernel\Exception\HttpException;
class ApplicationOverviewTest extends PhraseanetWebTestCaseAuthenticatedAbstract
{
@@ -91,6 +91,29 @@ class ApplicationOverviewTest extends PhraseanetWebTestCaseAuthenticatedAbstract
$this->get_a_permalink();
}
+ public function testGetAStorythumbnail()
+ {
+ $story = \record_adapter::createStory(self::$collection);
+
+ $media = $this->getMockBuilder('MediaVorus\Media\Media')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $symfoFile = new UploadedFile(__DIR__ . '/../../../testfiles/cestlafete.jpg', 'cestlafete.jpg');
+
+ $media->expects($this->any())
+ ->method('getFile')
+ ->will($this->returnValue($symfoFile));
+
+ $story->substitute_subdef('thumbnail', $media);
+
+ $this->client->request('GET', '/datafiles/' . $story->get_sbas_id() . '/' . $story->get_record_id() . '/preview/');
+ $response = $this->client->getResponse();
+
+ $this->assertEquals(200, $response->getStatusCode());
+ }
+
+
protected function get_a_permalink()
{
$token = self::$DI['record_1']->get_preview()->get_permalink()->get_token();
diff --git a/vendors.php b/vendors.php
index 4ead00efcd..d52b75d5f6 100755
--- a/vendors.php
+++ b/vendors.php
@@ -23,7 +23,7 @@ if ( ! file_exists($composer)) {
system('curl -s http://getcomposer.org/installer | php');
system('chmod +x ' . $composer);
- if ($argv[1] == '--no-dev') {
+ if (isset($argv[1]) && $argv[1] == '--no-dev') {
system($composer . ' install');
} else {
system($composer . ' install --dev');
@@ -36,7 +36,7 @@ if ( ! is_executable($composer)) {
system($composer . ' self-update');
-if ($argv[1] == '--no-dev') {
+if (isset($argv[1]) && $argv[1] == '--no-dev') {
system($composer . ' install');
} else {
system($composer . ' install --dev');
diff --git a/www/skins/lng/inclin-nl.png b/www/skins/lng/inclin-nl.png
new file mode 100644
index 0000000000..cbff390f3c
Binary files /dev/null and b/www/skins/lng/inclin-nl.png differ
diff --git a/www/skins/lng/nl_flag_18.gif b/www/skins/lng/nl_flag_18.gif
new file mode 100644
index 0000000000..c1c8f46d0c
Binary files /dev/null and b/www/skins/lng/nl_flag_18.gif differ