From bc78968764c741019a6b866ad434678cdbecbba4 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 20 Jan 2016 19:54:57 +0100 Subject: Move default configuration out of parameters These default configuration value shouldn't be in parameters.yml. --- src/Wallabag/CoreBundle/Controller/ConfigController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Wallabag/CoreBundle/Controller/ConfigController.php') diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 6c375909..4ece6431 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -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->container->getParameter('wallabag_core.theme')); + $config->setItemsPerPage($this->container->getParameter('wallabag_core.items_on_page')); + $config->setRssLimit($this->container->getParameter('wallabag_core.rss_limit')); + $config->setLanguage($this->container->getParameter('wallabag_core.language')); $em->persist($config); -- cgit v1.2.3 From 63e40f2d7c4074aff0be587c828eb511a6b7c878 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 21 Jan 2016 08:53:09 +0100 Subject: Add CraueConfig for internal settings --- src/Wallabag/CoreBundle/Controller/ConfigController.php | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Wallabag/CoreBundle/Controller/ConfigController.php') diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 4ece6431..c7513f79 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -163,6 +163,7 @@ class ConfigController extends Controller 'username' => $user->getUsername(), 'token' => $config->getRssToken(), ), + 'twofactor_auth' => $this->getParameter('twofactor_auth'), )); } -- cgit v1.2.3 From 67c99849ae03d41e94b144321d627e8c6ddd5fa3 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 21 Jan 2016 12:24:27 +0100 Subject: Use alias to get container parameters --- src/Wallabag/CoreBundle/Controller/ConfigController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Wallabag/CoreBundle/Controller/ConfigController.php') diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index c7513f79..25e69820 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -133,10 +133,10 @@ class ConfigController extends Controller $userManager->updateUser($newUser, true); $config = new Config($newUser); - $config->setTheme($this->container->getParameter('wallabag_core.theme')); - $config->setItemsPerPage($this->container->getParameter('wallabag_core.items_on_page')); - $config->setRssLimit($this->container->getParameter('wallabag_core.rss_limit')); - $config->setLanguage($this->container->getParameter('wallabag_core.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); -- cgit v1.2.3