mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-02-17 03:05:19 +00:00
Code Issues Projects Releases Wiki Activity

Move default configuration out of parameters

Browse source 
These default configuration value shouldn't be in parameters.yml.
This commit is contained in:
Jeremy Benoist 2016-01-20 19:54:57 +01:00
parent feb02cb709
commit bc78968764
10 changed files with 33 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/config/config.yml
View file

@ -33,6 +33,10 @@ wallabag_core:
fr: 'Français'
de: 'Deutsch'
tr: 'Türkçe'
items_on_page: 12
theme: material
language: en
rss_limit: 50
wallabag_import:
allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']

7
app/config/parameters.yml.dist
View file

@ -68,12 +68,5 @@ parameters:
wallabag_url: http://v2.wallabag.org
wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
# default user config
items_on_page: 12
theme: material
language: en
from_email: no-reply@wallabag.org
rss_limit: 50
# pocket import
pocket_consumer_key: xxxxxxxx

7
app/config/tests/parameters.yml.dist.mysql
View file

@ -58,12 +58,5 @@ parameters:
wallabag_url: http://v2.wallabag.org
wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
# default user config
items_on_page: 12
theme: material
language: en_US
from_email: no-reply@wallabag.org
rss_limit: 50
# pocket import
pocket_consumer_key: xxxxxxxx

7
app/config/tests/parameters.yml.dist.pgsql
View file

@ -58,12 +58,5 @@ parameters:
wallabag_url: http://v2.wallabag.org
wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
# default user config
items_on_page: 12
theme: material
language: en_US
from_email: no-reply@wallabag.org
rss_limit: 50
# pocket import
pocket_consumer_key: xxxxxxxx

7
app/config/tests/parameters.yml.dist.sqlite
View file

@ -58,12 +58,5 @@ parameters:
wallabag_url: http://v2.wallabag.org
wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
# default user config
items_on_page: 12
theme: material
language: en_US
from_email: no-reply@wallabag.org
rss_limit: 50
# pocket import
pocket_consumer_key: xxxxxxxx

8
src/Wallabag/CoreBundle/Command/InstallCommand.php
View file

@ -205,10 +205,10 @@ class InstallCommand extends ContainerAwareCommand
$em->persist($user);
$config = new Config($user);
$config->setTheme($this->getContainer()->getParameter('theme'));
$config->setItemsPerPage($this->getContainer()->getParameter('items_on_page'));
$config->setRssLimit($this->getContainer()->getParameter('rss_limit'));
$config->setLanguage($this->getContainer()->getParameter('language'));
$config->setTheme($this->getContainer()->getParameter('wallabag_core.theme'));
$config->setItemsPerPage($this->getContainer()->getParameter('wallabag_core.items_on_page'));
$config->setRssLimit($this->getContainer()->getParameter('wallabag_core.rss_limit'));
$config->setLanguage($this->getContainer()->getParameter('wallabag_core.language'));
$em->persist($config);

8
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->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);

12
src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
View file

@ -17,6 +17,18 @@ class Configuration implements ConfigurationInterface
->arrayNode('languages')
->prototype('scalar')->end()
->end()
->integerNode('items_on_page')
->defaultValue(12)
->end()
->scalarNode('theme')
->defaultValue('material')
->end()
->scalarNode('language')
->defaultValue('en')
->end()
->integerNode('rss_limit')
->defaultValue(50)
->end()
->end()
;

5
src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
View file

@ -13,7 +13,12 @@ class WallabagCoreExtension extends Extension
{
$configuration = new Configuration();
$config = $this->processConfiguration($configuration, $configs);
$container->setParameter('wallabag_core.languages', $config['languages']);
$container->setParameter('wallabag_core.items_on_page', $config['items_on_page']);
$container->setParameter('wallabag_core.theme', $config['theme']);
$container->setParameter('wallabag_core.language', $config['language']);
$container->setParameter('wallabag_core.rss_limit', $config['rss_limit']);
$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader->load('services.yml');

8
src/Wallabag/CoreBundle/Resources/config/services.yml
View file

@ -76,10 +76,10 @@ services:
class: Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener
arguments:
- "@doctrine.orm.entity_manager"
- %theme%
- %items_on_page%
- %rss_limit%
- %language%
- %wallabag_core.theme%
- %wallabag_core.items_on_page%
- %wallabag_core.rss_limit%
- %wallabag_core.language%
tags:
- { name: kernel.event_subscriber }