mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-24 10:23:17 +00:00
Fix sub views substitution
This commit is contained in:
committed by
Romain Neutron
parent
04dad80692
commit
93aa9be0fa
@@ -205,13 +205,13 @@ class Tools implements ControllerProviderInterface
|
|||||||
, $request->get('record_id')
|
, $request->get('record_id')
|
||||||
);
|
);
|
||||||
|
|
||||||
$media = $app['Core']['mediavorus']->guess($file);
|
$media = $app['Core']['mediavorus']->guess(new \SplFileInfo($tmpFile));
|
||||||
|
|
||||||
$record->substitute_subdef('thumbnail', $media);
|
$record->substitute_subdef('thumbnail', $media);
|
||||||
|
|
||||||
$success = true;
|
$success = true;
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
$errorMessage = $e->getMessage();
|
$errorMessage = _('An error occured');
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$errorMessage = _('file is not valid');
|
$errorMessage = _('file is not valid');
|
||||||
|
|||||||
@@ -57,7 +57,7 @@
|
|||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if selectionLength == 1 and registry.get('GV_seeOngChgDoc') %}
|
{% if selectionLength == 1 and (registry.get('GV_seeOngChgDoc') or registry.get('GV_seeNewThumb')) %}
|
||||||
<li>
|
<li>
|
||||||
<a href="#substitution">
|
<a href="#substitution">
|
||||||
{% trans "substitution" %}
|
{% trans "substitution" %}
|
||||||
@@ -73,7 +73,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
{# subef section #}
|
{# subdef section #}
|
||||||
<div id="subdefs" class="tabBox">
|
<div id="subdefs" class="tabBox">
|
||||||
<form id="new-img-form" action="/prod/tools/image/" method="post">
|
<form id="new-img-form" action="/prod/tools/image/" method="post">
|
||||||
<fieldset style='border:1px solid #999; padding:20px;'>
|
<fieldset style='border:1px solid #999; padding:20px;'>
|
||||||
@@ -269,10 +269,13 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{# hd sub section #}
|
{# hd sub section #}
|
||||||
{% if selectionLength == 1 %}
|
{% if selectionLength == 1 and (registry.get('GV_seeOngChgDoc') or registry.get('GV_seeNewThumb')) %}
|
||||||
{% for record in selection %}
|
{% for record in selection %}
|
||||||
<div id="substitution" class="tabBox">
|
<div id="substitution" class="tabBox">
|
||||||
|
|
||||||
|
{% if "unknown" == record.get_type() %}
|
||||||
|
<i class="icon-warning-sign icon-white"></i>{% trans "Substitution is not possible for this kind of record" %}
|
||||||
|
{% else %}
|
||||||
{% if registry.get('GV_seeOngChgDoc') %}
|
{% if registry.get('GV_seeOngChgDoc') %}
|
||||||
<div id="substitution-hd">
|
<div id="substitution-hd">
|
||||||
<form
|
<form
|
||||||
@@ -333,6 +336,7 @@
|
|||||||
<div class='resultAction'></div>
|
<div class='resultAction'></div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
59
tests/Alchemy/Phrasea/Controller/Prod/ToolsTest.php
Normal file
59
tests/Alchemy/Phrasea/Controller/Prod/ToolsTest.php
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
|
||||||
|
|
||||||
|
use Symfony\Component\HttpFoundation\File\UploadedFile;
|
||||||
|
|
||||||
|
class ControllerToolsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
|
||||||
|
{
|
||||||
|
protected $client;
|
||||||
|
protected $tmpFile;
|
||||||
|
|
||||||
|
public function setUp()
|
||||||
|
{
|
||||||
|
parent::setUp();
|
||||||
|
$this->client = $this->createClient();
|
||||||
|
$this->tmpFile = sys_get_temp_dir() . '/' . time() . mt_rand(1000, 9999) . '.jpg';
|
||||||
|
copy(__DIR__ . '/../../../../testfiles/cestlafete.jpg', $this->tmpFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function tearDown()
|
||||||
|
{
|
||||||
|
if (file_exists($this->tmpFile)) {
|
||||||
|
unlink($this->tmpFile);
|
||||||
|
}
|
||||||
|
parent::tearDown();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function createApplication()
|
||||||
|
{
|
||||||
|
$app = require __DIR__ . '/../../../../../lib/Alchemy/Phrasea/Application/Prod.php';
|
||||||
|
|
||||||
|
$app['debug'] = true;
|
||||||
|
unset($app['exception_handler']);
|
||||||
|
|
||||||
|
return $app;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testRouteChangeThumb()
|
||||||
|
{
|
||||||
|
$record = static::$records['record_1'];
|
||||||
|
|
||||||
|
$this->client->request('POST', '/tools/chgthumb/', array(
|
||||||
|
'sbas_id' => $record->get_sbas_id(),
|
||||||
|
'record_id' => $record->get_record_id(),
|
||||||
|
), array(
|
||||||
|
'newThumb' => new UploadedFile(
|
||||||
|
$this->tmpFile, 'KIKOO.JPG', 'image/jpg', 2000
|
||||||
|
)
|
||||||
|
));
|
||||||
|
|
||||||
|
$response = $this->client->getResponse();
|
||||||
|
|
||||||
|
$content = $response->getContent();
|
||||||
|
|
||||||
|
$this->assertEquals(200, $response->getStatusCode());
|
||||||
|
$this->assertFalse(strpos(_('An error occured'), $content));
|
||||||
|
$this->assertFalse(strpos(_('file is not valid'), $content));
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user