Browse Source

Merge branch '2.3'

Conflicts:
	.travis.yml
Andrej Hudec 9 years ago
parent
commit
0063321ee6
2 changed files with 2 additions and 1 deletions
  1. 1 1
      .travis.yml
  2. 1 0
      Controller/HelperController.php

+ 1 - 1
.travis.yml

@@ -47,7 +47,7 @@ before_script:
   - mkdir -p ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d && echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - composer selfupdate
   - composer config -q -g github-oauth.github.com $GITHUB_OAUTH_TOKEN
-  - composer global require phpunit/phpunit:^4.8 fabpot/php-cs-fixer --no-update
+  - composer global require phpunit/phpunit:@stable fabpot/php-cs-fixer --no-update
   - composer global update --prefer-dist --no-interaction
   - if [ "$SYMFONY_VERSION" = "2.8.*@dev" ] || [ "$SYMFONY_VERSION" = "3.0.x-dev as 2.8" ]; then SYMFONY_DEPRECATIONS_HELPER=strict; fi;
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;

+ 1 - 0
Controller/HelperController.php

@@ -377,6 +377,7 @@ class HelperController
             return new JsonResponse(array('status' => 'KO', 'message' => 'Too short search string.'), 403);
         }
 
+        $targetAdmin->setPersistFilters(false);
         $datagrid = $targetAdmin->getDatagrid();
 
         if ($callback !== null) {