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

Bump Phraseanet Production Client

Browse Source 
update video tools features, fix misc issues
    - fix pym.js integration issues
    - fix record editor's preview tab
    - add video Editor in record Editor
    - export VTT content to VideoTextTrack field
This commit is contained in:
Florian BLOUET
2016-07-05 13:29:30 +02:00
parent bb2d2084a9
commit 6774f5cd9e
4 changed files with 79 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/Alchemy/Phrasea/Controller/Prod/EditController.php
View File

@@ -20,6 +20,7 @@ use Alchemy\Phrasea\Model\Entities\Preset;
use Alchemy\Phrasea\Model\Entities\User;
use Alchemy\Phrasea\Model\Manipulator\PresetManipulator;
use Alchemy\Phrasea\Model\Repositories\PresetRepository;
use Alchemy\Phrasea\Twig\PhraseanetExtension;
use Alchemy\Phrasea\Vocabulary\ControlProvider\ControlProviderInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -206,18 +207,21 @@ class EditController extends Controller
'h' => $thumbnail->get_height(),
];
$elements[$indice]['preview'] = $this->render(
$elements[$indice]['template'] = $this->render(
'common/preview.html.twig',
['record' => $record]
['record' => $record, 'not_wrapped' => true]
);
$elements[$indice]['data'] = $this->getRecordElementData($record);
$elements[$indice]['type'] = $record->getType();
}
}
$conf = $this->getConf();
$params = [
'multipleDataboxes' => $multipleDataboxes,
'recordsRequest' => $records,
'videoEditorConfig' => $conf->get(['video-editor']),
'databox' => $databox,
'JSonStatus' => json_encode($status),
'JSonRecords' => json_encode($elements),
@@ -524,4 +528,35 @@ class EditController extends Controller
return $this->app['manipulator.preset'];
}
/**
* @param \record_adapter $record
* @return array
*/
private function getRecordElementData($record) {
$helpers = new PhraseanetExtension($this->app);
$recordData = [
'databoxId' => $record->getBaseId(),
'id' => $record->getId(),
'isGroup' => $record->isStory(),
'url' => (string)$helpers->getThumbnailUrl($record),
];
$userHaveAccess = $this->app->getAclForUser($this->getAuthenticatedUser())->has_access_to_subdef($record, 'preview');
if ($userHaveAccess) {
$recordPreview = $record->get_preview();
} else {
$recordPreview = $record->get_thumbnail();
}
$recordData['preview'] = [
'width' => $recordPreview->get_width(),
'height' => $recordPreview->get_height(),
'url' => $this->app->url('alchemy_embed_view', [
'url' => (string)($this->getAuthenticatedUser() ? $recordPreview->get_url() : $recordPreview->get_permalink()->get_url()),
'autoplay' => false
])
];
return $recordData;
}
}