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

minor fix

Browse Source
This commit is contained in:
Jean-Yves Gaulier
2015-03-12 17:08:39 +01:00
parent d1894b375c
commit ff83ee8cb0
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -606,15 +606,14 @@ class SearchEngineOptions
$options->disallowBusinessFields(); $options->disallowBusinessFields();
$options->setLocale($app['locale']); $options->setLocale($app['locale']);
if (is_array($request->get('bases'))) { $selected_bases = $request->get('bases');
$bas = array_map(function ($base_id) use ($app) { if (is_array($selected_bases)) {
$bas = [];
foreach ($selected_bases as $bas_id) {
try { try {
return \collection::get_from_base_id($app, $base_id); $bas[$bas_id] = \collection::get_from_base_id($app, $bas_id);
} catch (\Exception_Databox_CollectionNotFound $e) { } catch (\Exception_Databox_CollectionNotFound $e) {}
return null; }
}
}, $request->get('bases'));
} elseif (!$app['authentication']->isAuthenticated()) { } elseif (!$app['authentication']->isAuthenticated()) {
$bas = $app->getOpenCollections(); $bas = $app->getOpenCollections();
} else { } else {
@@ -648,7 +647,6 @@ class SearchEngineOptions
$options->allowBusinessFieldsOn($BF); $options->allowBusinessFieldsOn($BF);
} }
$status = is_array($request->get('status')) ? $request->get('status') : []; $status = is_array($request->get('status')) ? $request->get('status') : [];
$fields = is_array($request->get('fields')) ? $request->get('fields') : []; $fields = is_array($request->get('fields')) ? $request->get('fields') : [];

4
lib/conf.d/minifyGroupsConfig.php
View File

@@ -110,7 +110,9 @@ $groups = [
, '//include/jquery.image_enhancer.js' , '//include/jquery.image_enhancer.js'
, '//include/jslibs/jquery.contextmenu_scroll.js' , '//include/jslibs/jquery.contextmenu_scroll.js'
, '//assets/jquery.treeview/jquery.treeview.js' , '//assets/jquery.treeview/jquery.treeview.js'
, '//assets/jquery.treeview/jquery.treeview.async.js'], , '//assets/jquery.treeview/jquery.treeview.async.js'
, '//assets/requirejs/require.js'
],
'thesaurus' => [ 'thesaurus' => [
'//assets/jquery.cookie/jquery.cookie.js' '//assets/jquery.cookie/jquery.cookie.js'
, '//include/jslibs/jquery.contextmenu_scroll.js' , '//include/jslibs/jquery.contextmenu_scroll.js'

2
templates/web/prod/index.html.twig
View File

@@ -25,7 +25,7 @@
onclick="cancelEvent(event);return false;" onclick="cancelEvent(event);return false;"
onmousedown="infoSbas(this, {{sbas_id}}, false, event); return false;" onmousedown="infoSbas(this, {{sbas_id}}, false, event); return false;"
id="ck_{{collection["base_id"]}}_{{unique_id}}" type="checkbox" id="ck_{{collection["base_id"]}}_{{unique_id}}" type="checkbox"
name="bases[]" value="{{collection["base_id"]}}" {% if collection["selected"] %}checked="checked"{% endif %} /> name="bases[{{ collection["base_id"] }}]" value="{{collection["base_id"]}}" {% if collection["selected"] %}checked="checked"{% endif %} />
</td> </td>
<td> <td>
<label style="line-height: 18px;" onclick="infoSbas($('#ck_{{base_id}}_{{unique_id}}'),{{sbas_id}}, false, event); return false;" <label style="line-height: 18px;" onclick="infoSbas($('#ck_{{base_id}}_{{unique_id}}'),{{sbas_id}}, false, event); return false;"