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

Merge pull request #1375 from jygaulier/SUBSTITUTE_SUBDEF

Browse Source 
report api substitute / nosubdef
This commit is contained in:
Benoît Burnichon
2015-05-11 12:13:42 +02:00
parent 3856622d48 ae24e5332a
commit a024ea8b90
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Alchemy/Phrasea/Controller/Api/V1Controller.php
View File

@@ -869,10 +869,12 @@ class V1Controller extends Controller
'You do not have access to collection %s', $collection->get_label($this->app['locale.I18n'])
));
}
$record->substitute_subdef($request->get('name'), $media, $this->app);
$adapt = ($request->get('adapt')===null || !(\p4field::isno($request->get('adapt'))));
$ret['adapt'] = $adapt;
$record->substitute_subdef($request->get('name'), $media, $this->app, $adapt);
foreach ($record->get_embedable_medias() as $name => $media) {
if ($name == $request->get('name') &&
null !== ($subdef = $this->listEmbeddableMedia($record, $media, $this->app['phraseanet.registry']))) {
null !== ($subdef = $this->listEmbeddableMedia($record, $media))) {
$ret[] = $subdef;
}
}