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

Merge pull request #29 from nlegoff/pr-preview

Browse Source 
Fix record preview in production
This commit is contained in:
Mathieu Darse
2015-02-23 18:19:40 +01:00
parent 19775d5908 50165bd894
commit 29c5308556
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Controller/Prod/Query.php
View File

@@ -221,7 +221,7 @@ class Query implements ControllerProviderInterface
return $app->json([ return $app->json([
'current' => $app['twig']->render('prod/preview/result_train.html.twig', [ 'current' => $app['twig']->render('prod/preview/result_train.html.twig', [
'records' => $record->get_train($pos, $query, $app['phraseanet.SE']), 'records' => $record->get_train($pos, $query, $app['phraseanet.SE'], $options),
'selected' => $pos 'selected' => $pos
]) ])
]); ]);

4
lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
View File

@@ -497,6 +497,8 @@ class SearchEngineOptions
$options = new static(); $options = new static();
$options->disallowBusinessFields(); $options->disallowBusinessFields();
$sort_by = $sort_ord = null;
foreach ($serialized as $key => $value) { foreach ($serialized as $key => $value) {
switch (true) { switch (true) {
@@ -530,8 +532,6 @@ class SearchEngineOptions
break; break;
} }
$sort_by = $sort_ord = null;
switch ($key) { switch ($key) {
case 'record_type': case 'record_type':
$options->setRecordType($value); $options->setRecordType($value);

4
lib/classes/record/preview.php
View File

@@ -204,7 +204,7 @@ class record_preview extends record_adapter
return $this; return $this;
} }
public function get_train($pos = 0, $query = '', SearchEngineInterface $search_engine = null) public function get_train($pos = 0, $query = '', SearchEngineInterface $search_engine = null, SearchEngineOptions $options)
{ {
if ($this->train) { if ($this->train) {
return $this->train; return $this->train;
@@ -214,7 +214,7 @@ class record_preview extends record_adapter
case 'RESULT': case 'RESULT':
$perPage = 56; $perPage = 56;
$index = ($pos - 3) < 0 ? 0 : ($pos - 3); $index = ($pos - 3) < 0 ? 0 : ($pos - 3);
$results = $search_engine->query($query, $index, $perPage); $results = $search_engine->query($query, $index, $perPage, $options);
$this->train = $results->getResults()->toArray(); $this->train = $results->getResults()->toArray();
break; break;