diff --git a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php index e3018fbc82..364e8c1523 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php +++ b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php @@ -606,15 +606,14 @@ class SearchEngineOptions $options->disallowBusinessFields(); $options->setLocale($app['locale']); - if (is_array($request->get('bases'))) { - $bas = array_map(function ($base_id) use ($app) { + $selected_bases = $request->get('bases'); + if (is_array($selected_bases)) { + $bas = []; + foreach ($selected_bases as $bas_id) { try { - return \collection::get_from_base_id($app, $base_id); - } catch (\Exception_Databox_CollectionNotFound $e) { - return null; - } - - }, $request->get('bases')); + $bas[$bas_id] = \collection::get_from_base_id($app, $bas_id); + } catch (\Exception_Databox_CollectionNotFound $e) {} + } } elseif (!$app['authentication']->isAuthenticated()) { $bas = $app->getOpenCollections(); } else { @@ -648,7 +647,6 @@ class SearchEngineOptions $options->allowBusinessFieldsOn($BF); } - $status = is_array($request->get('status')) ? $request->get('status') : []; $fields = is_array($request->get('fields')) ? $request->get('fields') : []; diff --git a/lib/conf.d/minifyGroupsConfig.php b/lib/conf.d/minifyGroupsConfig.php index cd7fa475d4..0a67fa8ead 100644 --- a/lib/conf.d/minifyGroupsConfig.php +++ b/lib/conf.d/minifyGroupsConfig.php @@ -110,7 +110,9 @@ $groups = [ , '//include/jquery.image_enhancer.js' , '//include/jslibs/jquery.contextmenu_scroll.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' => [ '//assets/jquery.cookie/jquery.cookie.js' , '//include/jslibs/jquery.contextmenu_scroll.js' diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index 3c24ff9480..07fc3c145e 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -25,7 +25,7 @@ onclick="cancelEvent(event);return false;" onmousedown="infoSbas(this, {{sbas_id}}, false, event); return false;" 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 %} />