diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index e936911c4..258a585f4 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -37,5 +37,7 @@ parameters: export_mobi: true export_pdf: true - # List view + # default user config items_on_page: 12 + theme: baggy + language: en_US diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php index a43019584..c1b726048 100644 --- a/src/Wallabag/CoreBundle/Command/InstallCommand.php +++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php @@ -135,11 +135,10 @@ class InstallCommand extends ContainerAwareCommand $em->persist($user); - $config = new Config(); - $config->setUser($user); - $config->setTheme('baggy'); - $config->setItemsPerPage(10); - $config->setLanguage('en_US'); + $config = new Config($user); + $config->setTheme($this->getContainer()->getParameter('theme')); + $config->setItemsPerPage($this->getContainer()->getParameter('items_on_page')); + $config->setLanguage($this->getContainer()->getParameter('language')); $em->persist($config); } diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index aedbc9999..68e034fa7 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -81,6 +81,14 @@ class ConfigController extends Controller if ($newUserForm->isValid()) { $em->persist($newUser); + + $config = new Config($newUser); + $config->setTheme($this->container->getParameter('theme')); + $config->setItemsPerPage($this->container->getParameter('items_on_page')); + $config->setLanguage($this->container->getParameter('language')); + + $em->persist($config); + $em->flush(); $this->get('session')->getFlashBag()->add(