mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 01:43:13 +00:00
Merge branch 'master' into PHRAS-3049_more_setup_in_docker-compose
This commit is contained in:
@@ -512,6 +512,8 @@ class PushController extends Controller
|
||||
->like(\User_Query::LIKE_FIRSTNAME, $request->query->get('query'))
|
||||
->like(\User_Query::LIKE_LASTNAME, $request->query->get('query'))
|
||||
->like(\User_Query::LIKE_LOGIN, $request->query->get('query'))
|
||||
->like(\User_Query::LIKE_EMAIL, $request->query->get('query'))
|
||||
->like(\User_Query::LIKE_COMPANY, $request->query->get('query'))
|
||||
->like_match(\User_Query::LIKE_MATCH_OR);
|
||||
|
||||
$result = $query
|
||||
|
@@ -48,6 +48,7 @@ class SubdefsController extends Controller
|
||||
return $this->render('prod/actions/Tools/metadata.html.twig', [
|
||||
'record' => $record,
|
||||
'metadatas' => $metadataBag,
|
||||
'subdef_name' => $subdef_name
|
||||
]);
|
||||
}
|
||||
|
||||
|
@@ -47,6 +47,8 @@ class ToolsController extends Controller
|
||||
$record = $records->first();
|
||||
$databox = $record->getDatabox();
|
||||
|
||||
/**Array list of subdefs**/
|
||||
$listsubdef = array_keys($record-> get_subdefs());
|
||||
// fetch subdef list:
|
||||
$subdefs = $record->get_subdefs();
|
||||
|
||||
@@ -57,7 +59,6 @@ class ToolsController extends Controller
|
||||
&& $acl->has_right_on_base($record->getBaseId(), \ACL::IMGTOOLS)
|
||||
) {
|
||||
$databoxSubdefs = $record->getDatabox()->get_subdef_structure()->getSubdefGroup($record->getType());
|
||||
|
||||
foreach ($subdefs as $subdef) {
|
||||
$label = $subdefName = $subdef->get_name();
|
||||
if (null === $permalink = $subdef->get_permalink()) {
|
||||
@@ -94,6 +95,7 @@ class ToolsController extends Controller
|
||||
'record' => $record,
|
||||
'recordSubdefs' => $recordAccessibleSubdefs,
|
||||
'metadatas' => $metadatas,
|
||||
'listsubdef' => $listsubdef
|
||||
]);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user