oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-01 17:38:38 +00:00
Code Wiki Activity

Merge pull request #1612 from wallabag/v2-settings-page

Browse source 
Settings page
This commit is contained in:
Nicolas Lœuillet 2016-02-04 15:59:57 +01:00
commit e008c037f5
40 changed files with 510 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Wallabag/CoreBundle/Controller/ConfigController.php
View file

@ -133,10 +133,10 @@ class ConfigController extends Controller
$userManager->updateUser($newUser, true);
$config = new Config($newUser);
$config->setTheme($this->container->getParameter('theme'));
$config->setItemsPerPage($this->container->getParameter('items_on_page'));
$config->setRssLimit($this->container->getParameter('rss_limit'));
$config->setLanguage($this->container->getParameter('language'));
$config->setTheme($this->getParameter('wallabag_core.theme'));
$config->setItemsPerPage($this->getParameter('wallabag_core.items_on_page'));
$config->setRssLimit($this->getParameter('wallabag_core.rss_limit'));
$config->setLanguage($this->getParameter('wallabag_core.language'));
$em->persist($config);
@ -163,6 +163,7 @@ class ConfigController extends Controller
'username' => $user->getUsername(),
'token' => $config->getRssToken(),
),
'twofactor_auth' => $this->getParameter('twofactor_auth'),
));
}