hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #322 from nlegoff/fix_1111

Browse Source 
[3.7] Fix #1111 sub views substitution is broken
This commit is contained in:
Romain Neutron
2013-03-21 11:42:56 -07:00
parent 04dad80692 2ba14821b3
commit 84be237256
4 changed files with 187 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
lib/Alchemy/Phrasea/Controller/Prod/Tools.php
View File

@@ -127,30 +127,29 @@ class Tools implements ControllerProviderInterface
$controllers->post('/hddoc/', function(Application $app, Request $request) {
$success = false;
$errorMessage = "";
$fileName = null;
$message = _('An error occured');
if ($file = $request->files->get('newHD')) {
$fileName = $file->getClientOriginalName();
if ($file->isValid()) {
$fileName = $file->getClientOriginalName();
$size = $file->getClientSize();
$tempoFile = tempnam(sys_get_temp_dir(), 'substit');
unlink($tempoFile);
mkdir($tempoFile);
$tempoFile = $tempoFile . DIRECTORY_SEPARATOR . $fileName;
copy($file->getPathname(), $tempoFile);
if ($file->getClientSize() && $fileName && $file->isValid()) {
try {
$record = new \record_adapter(
$request->get('sbas_id')
, $request->get('record_id')
$tmpFile = sprintf(
'%stmp/%s',
$app['Core']->getRegistry()->get('GV_RootPath'),
$fileName
);
$media = $app['Core']['mediavorus']->guess(new \SplFileInfo($tempoFile));
if (false === rename($file->getPathname(), $tmpFile)) {
throw new \Exception();
}
$record = new \record_adapter(
$request->get('sbas_id'),
$request->get('record_id')
);
$media = $app['Core']['mediavorus']->guess(new \SplFileInfo($tmpFile));
$record->substitute_subdef('document', $media);
@@ -159,72 +158,64 @@ class Tools implements ControllerProviderInterface
}
$success = true;
$message = _('Document has been successfully substitued');
unlink($tmpFile);
} catch (\Exception $e) {
$errorMessage = $e->getMessage();
}
unlink($tempoFile);
rmdir(dirname($tempoFile));
unlink($file->getPathname());
}
} else {
$errorMessage = _('file is not valid');
$message = _('file is not valid');
}
}
$template = 'prod/actions/Tools/iframeUpload.html.twig';
$var = array(
'success' => $success
, 'fileName' => $fileName
, 'errorMessage' => $errorMessage
);
return new Response($app['Core']->getTwig()->render($template, $var));
/**
*
*/
return new Response($app['Core']->getTwig()->render('prod/actions/Tools/iframeUpload.html.twig', array(
'success' => $success,
'message' => $message,
)));
});
$controllers->post('/chgthumb/', function(Application $app, Request $request) {
$success = false;
$errorMessage = "";
$message = _('An error occured');
if ($file = $request->files->get('newThumb')) {
$size = $file->getClientSize();
$fileName = $file->getClientOriginalName();
if ($size && $fileName && $file->isValid()) {
if ($file->getClientSize() && $fileName && $file->isValid()) {
try {
$rootPath = $app['Core']->getRegistry()->get('GV_RootPath');
$tmpFile = $rootPath . 'tmp/' . $fileName;
rename($file->getPathname(), $tmpFile);
$record = new \record_adapter(
$request->get('sbas_id')
, $request->get('record_id')
$tmpFile = sprintf(
'%stmp/%s',
$app['Core']->getRegistry()->get('GV_RootPath'),
$fileName
);
$media = $app['Core']['mediavorus']->guess($file);
if (false === rename($file->getPathname(), $tmpFile)) {
throw new \Exception();
}
$record = new \record_adapter(
$request->get('sbas_id'),
$request->get('record_id')
);
$media = $app['Core']['mediavorus']->guess(new \SplFileInfo($tmpFile));
$record->substitute_subdef('thumbnail', $media);
$success = true;
$message = _('Thumbnail has been successfully substitued');
unlink($tmpFile);
} catch (\Exception $e) {
$errorMessage = $e->getMessage();
}
} else {
$errorMessage = _('file is not valid');
$message = _('file is not valid');
}
$template = 'prod/actions/Tools/iframeUpload.html.twig';
$var = array(
'success' => $success
, 'fileName' => $fileName
, 'errorMessage' => $errorMessage
);
return new Response($app['Core']->getTwig()->render($template, $var));
return new Response($app['Core']->getTwig()->render('prod/actions/Tools/iframeUpload.html.twig', array(
'success' => $success,
'message' => $message,
)));
}
});

7
templates/web/prod/actions/Tools/iframeUpload.html.twig
View File

@@ -1,7 +1,4 @@
<div class='content'>
{% if not success %}
{% trans 'an error occured' %}
{{errorMessage}}
{% endif %}
<div class='content {% if not success %}text-error{% endif %}'>
{{ message }}
</div>

120
templates/web/prod/actions/Tools/index.html.twig
View File

@@ -57,7 +57,7 @@
</a>
</li>
{% endif %}
{% if selectionLength == 1 and registry.get('GV_seeOngChgDoc') %}
{% if selectionLength == 1 and (registry.get('GV_seeOngChgDoc') or registry.get('GV_seeNewThumb')) %}
<li>
<a href="#substitution">
{% trans "substitution" %}
@@ -73,7 +73,7 @@
{% endif %}
</ul>
</div>
{# subef section #}
{# subdef section #}
<div id="subdefs" class="tabBox">
<form id="new-img-form" action="/prod/tools/image/" method="post">
<fieldset style='border:1px solid #999; padding:20px;'>
@@ -269,70 +269,72 @@
{% endif %}
{# hd sub section #}
{% if selectionLength == 1 %}
{% if selectionLength == 1 and (registry.get('GV_seeOngChgDoc') or registry.get('GV_seeNewThumb')) %}
{% for record in selection %}
<div id="substitution" class="tabBox">
{% if registry.get('GV_seeOngChgDoc') %}
<div id="substitution-hd">
<form
name ="formchgHD"
action="/prod/tools/hddoc/"
enctype="multipart/form-data"
method="post"
target="uploadHdsub">
{% 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') %}
<div id="substitution-hd">
<form
name ="formchgHD"
action="/prod/tools/hddoc/"
enctype="multipart/form-data"
method="post"
target="uploadHdsub">
<fieldset style='border:1px solid #999;padding:20px;'>
<legend style='color:#EEE'>&nbsp;<b>{% trans "substitution HD" %}</b>&nbsp;</legend>
<div>
<input type="hidden" name="MAX_FILE_SIZE" value="20000000" />
<input id='new-hd-file' name="newHD" type="file" />
<br />
<label for="CCFNALP" class="checkbox">
<input type="checkbox" name="ccfilename" id="CCFNALP" value="1">
{% trans "mettre a jour le nom original de fichier apres substitution"%}
</label>
<input type="hidden" name="ACT" value="SEND" />
<input type="hidden" name="sbas_id" value="{{record.get_sbas_id()}}"/>
<input type="hidden" name="record_id" value="{{record.get_record_id()}}" />
<div class="load"></div>
</div>
</fieldset>
<div style='text-align:right;padding-top:10px;'>
<button class="iframe_submiter btn btn-inverse">{% trans "validate" %}</button>
<button class="action_cancel btn btn-inverse">{% trans "cancel" %}</button>
<fieldset style='border:1px solid #999;padding:20px;'>
<legend style='color:#EEE'>&nbsp;<b>{% trans "substitution HD" %}</b>&nbsp;</legend>
<div>
<input id='new-hd-file' name="newHD" type="file"/>
<br />
<label for="CCFNALP" class="checkbox">
<input type="checkbox" name="ccfilename" id="CCFNALP" value="1">
{% trans "mettre a jour le nom original de fichier apres substitution"%}
</label>
<input type="hidden" name="ACT" value="SEND" />
<input type="hidden" name="sbas_id" value="{{record.get_sbas_id()}}"/>
<input type="hidden" name="record_id" value="{{record.get_record_id()}}" />
<div class="load"></div>
</div>
</fieldset>
<div style='text-align:right;padding-top:10px;'>
<button class="iframe_submiter btn btn-inverse">{% trans "validate" %}</button>
<button class="action_cancel btn btn-inverse">{% trans "cancel" %}</button>
</div>
</form>
<div class='resultAction'></div>
</div>
</form>
<div class='resultAction'></div>
</div>
{% endif %}
{% endif %}
{% if registry.get('GV_seeNewThumb') %}
<div id="substitution-sd">
<form
name="formchgHD"
action="/prod/tools/chgthumb/"
enctype="multipart/form-data"
method="post"
target="uploadHdsub">
<fieldset style='border:1px solid #999;padding:20px;'>
<legend style='color:#EEE'>&nbsp;<b>{% trans "substitution SD" %}</b>&nbsp;</legend>
<div>
<input type="hidden" name="MAX_FILE_SIZE" value="20000000" />
<input id='new-sd-file' name="newThumb" type="file" />
<input type="hidden" name="sbas_id" value="{{record.get_sbas_id()}}" />
<input type="hidden" name="record_id" value="{{record.get_record_id()}}" />
<div class="load"></div>
</div>
</fieldset>
<div style='text-align:right;padding-top:10px;'>
<button class="iframe_submiter btn btn-inverse">{% trans "validate" %}</button>
<button class="action_cancel btn btn-inverse">{% trans "cancel" %}</button>
{% if registry.get('GV_seeNewThumb') %}
<div id="substitution-sd">
<form
name="formchgHD"
action="/prod/tools/chgthumb/"
enctype="multipart/form-data"
method="post"
target="uploadHdsub">
<fieldset style='border:1px solid #999;padding:20px;'>
<legend style='color:#EEE'>&nbsp;<b>{% trans "substitution SD" %}</b>&nbsp;</legend>
<div>
<input id='new-sd-file' name="newThumb" type="file" />
<input type="hidden" name="sbas_id" value="{{record.get_sbas_id()}}" />
<input type="hidden" name="record_id" value="{{record.get_record_id()}}" />
<div class="load"></div>
</div>
</fieldset>
<div style='text-align:right;padding-top:10px;'>
<button class="iframe_submiter btn btn-inverse">{% trans "validate" %}</button>
<button class="action_cancel btn btn-inverse">{% trans "cancel" %}</button>
</div>
</form>
<div class='resultAction'></div>
</div>
</form>
<div class='resultAction'></div>
</div>
{% endif %}
{% endif %}
{% endif %}
</div>
{% endfor %}
{% endif %}

75
tests/Alchemy/Phrasea/Controller/Prod/ToolsTest.php Normal file
View File

@@ -0,0 +1,75 @@
<?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 testRouteChangeDoc()
{
$record = static::$records['record_1'];
$crawler = $this->client->request('POST', '/tools/hddoc/', array(
'sbas_id' => $record->get_sbas_id(),
'record_id' => $record->get_record_id(),
), array(
'newHD' => new UploadedFile(
$this->tmpFile, 'KIKOO.JPG', 'image/jpg', 2000
)
));
$response = $this->client->getResponse();
$message = trim($crawler->filterXPath('//div')->text());
$this->assertEquals(200, $response->getStatusCode());
$this->assertEquals(_('Document has been successfully substitued'), $message);
}
public function testRouteChangeThumb()
{
$record = static::$records['record_1'];
$crawler = $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();
$message = trim($crawler->filterXPath('//div')->text());
$this->assertEquals(200, $response->getStatusCode());
$this->assertEquals(_('Thumbnail has been successfully substitued'), $message);
}
}