diff --git a/lib/Alchemy/Phrasea/Controller/Client/Root.php b/lib/Alchemy/Phrasea/Controller/Client/Root.php index 2ef659f89e..da2c1c4f04 100644 --- a/lib/Alchemy/Phrasea/Controller/Client/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Client/Root.php @@ -34,7 +34,7 @@ class Root implements ControllerProviderInterface * * Redirect to production with a nice message */ - $app['session']->getFlashBag()->add('client_deprecated'); + $app['session']->getFlashBag()->add('client_deprecated', ''); return $app->redirectPath('prod'); diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index 0132e12d8d..3e2d271124 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -303,11 +303,11 @@
{% if GV_multiAndReport %} {% else %} diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php index c343938067..b1734e998b 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php @@ -6,19 +6,6 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract { protected $client; - /** - * @covers Alchemy\Phrasea\Controller\Client\Root::connect - * @covers Alchemy\Phrasea\Controller\Client\Root::call - * @covers Alchemy\Phrasea\Controller\Client\Root::getClient - * @covers Alchemy\Phrasea\Controller\Client\Root::getDefaultClientStartPage - * @covers Alchemy\Phrasea\Controller\Client\Root::getQueryStartPage - * @covers Alchemy\Phrasea\Controller\Client\Root::getHelpStartPage - * @covers Alchemy\Phrasea\Controller\Client\Root::getPublicationStartPage - * @covers Alchemy\Phrasea\Controller\Client\Root::getGridProperty - * @covers Alchemy\Phrasea\Controller\Client\Root::getDocumentStorageAccess - * @covers Alchemy\Phrasea\Controller\Client\Root::getTabSetup - * @covers Alchemy\Phrasea\Controller\Client\Root::getCssFile - */ public function testGetClient() { $this->authenticate(self::$DI['app']); diff --git a/www/skins/prod/jquery.main-prod.js b/www/skins/prod/jquery.main-prod.js index 028939b7dc..25a2689b88 100644 --- a/www/skins/prod/jquery.main-prod.js +++ b/www/skins/prod/jquery.main-prod.js @@ -756,6 +756,16 @@ function HueToRgb(m1, m2, hue) { $(document).ready(function () { + $('input[name=search_type]').bind('click', function () { + var $this = $(this); + var $record_types = $('#recordtype_sel'); + if ($this.hasClass('mode_type_reg')) { + $record_types.attr('disabled', true); + } else { + $record_types.removeAttr('disabled'); + } + }); + $('.adv_search_button').live('click', function () { var searchForm = $('#searchForm'); var parent = searchForm.parent();