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

PHRAS-343 Disabled record type when choosing story search mode

Browse Source
This commit is contained in:
Nicolas Le Goff
2015-01-12 15:31:00 +01:00
parent b3d50619c5
commit a609685417
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Controller/Client/Root.php
View File

@@ -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');

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

@@ -303,11 +303,11 @@
<div class="controls">
{% if GV_multiAndReport %}
<label for="mode_type_doc" class="radio inline">
<input type="radio" value="0" class="mode_type_doc_reg" name="search_type" {% if GV_defaultQuery_type == 0 %}checked="checked"{% endif %} id="mode_type_doc"/>
<input type="radio" value="0" class="mode_type_doc" name="search_type" {% if GV_defaultQuery_type == 0 %}checked="checked"{% endif %} id="mode_type_doc"/>
{% trans 'phraseanet::type:: documents' %}
</label>
<label for="mode_type_reg" class="radio inline">
<input type="radio" value="1" class="mode_type_doc_reg" name="search_type" {% if GV_defaultQuery_type != 0 %}checked="checked"{% endif %} id="mode_type_reg"/>
<input type="radio" value="1" class="mode_type_reg" name="search_type" {% if GV_defaultQuery_type != 0 %}checked="checked"{% endif %} id="mode_type_reg"/>
{% trans 'phraseanet::type:: reportages' %}
</label>
{% else %}

13
tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php
View File

@@ -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']);

10
www/skins/prod/jquery.main-prod.js
View File

@@ -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();