pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #2005 from wallabag/fix-readingspeed-not-defined

Browse Source 
Fix reading speed not defined when user was created via config page
This commit is contained in:
Jeremy Benoist
2016-05-03 09:04:02 +02:00
parent ba9fee0855 8389074180
commit 045859a2b5
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Wallabag/CoreBundle/Controller/ConfigController.php
View File

@ -140,6 +140,7 @@ class ConfigController extends Controller
$config->setItemsPerPage($this->getParameter('wallabag_core.items_on_page')); $config->setItemsPerPage($this->getParameter('wallabag_core.items_on_page'));
$config->setRssLimit($this->getParameter('wallabag_core.rss_limit')); $config->setRssLimit($this->getParameter('wallabag_core.rss_limit'));
$config->setLanguage($this->getParameter('wallabag_core.language')); $config->setLanguage($this->getParameter('wallabag_core.language'));
$config->setReadingSpeed($this->getParameter('wallabag_core.reading_speed'));
$em->persist($config); $em->persist($config);

5
src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
View File

@ -355,6 +355,11 @@ class ConfigControllerTest extends WallabagCoreTestCase
$this->assertTrue(false !== $user); $this->assertTrue(false !== $user);
$this->assertTrue($user->isEnabled()); $this->assertTrue($user->isEnabled());
$this->assertEquals('material', $user->getConfig()->getTheme());
$this->assertEquals(12, $user->getConfig()->getItemsPerPage());
$this->assertEquals(50, $user->getConfig()->getRssLimit());
$this->assertEquals('en', $user->getConfig()->getLanguage());
$this->assertEquals(1, $user->getConfig()->getReadingSpeed());
} }
public function testRssUpdateResetToken() public function testRssUpdateResetToken()