diff options
Diffstat (limited to 'src/Wallabag/CoreBundle')
3 files changed, 11 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php index 45358022..3d4d5def 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php +++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php | |||
@@ -22,6 +22,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface | |||
22 | $adminConfig->setLanguage('en'); | 22 | $adminConfig->setLanguage('en'); |
23 | $adminConfig->setPocketConsumerKey('xxxxx'); | 23 | $adminConfig->setPocketConsumerKey('xxxxx'); |
24 | $adminConfig->setActionMarkAsRead(0); | 24 | $adminConfig->setActionMarkAsRead(0); |
25 | $adminConfig->setListMode(0); | ||
25 | 26 | ||
26 | $manager->persist($adminConfig); | 27 | $manager->persist($adminConfig); |
27 | 28 | ||
@@ -34,6 +35,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface | |||
34 | $bobConfig->setLanguage('fr'); | 35 | $bobConfig->setLanguage('fr'); |
35 | $bobConfig->setPocketConsumerKey(null); | 36 | $bobConfig->setPocketConsumerKey(null); |
36 | $bobConfig->setActionMarkAsRead(1); | 37 | $bobConfig->setActionMarkAsRead(1); |
38 | $bobConfig->setListMode(1); | ||
37 | 39 | ||
38 | $manager->persist($bobConfig); | 40 | $manager->persist($bobConfig); |
39 | 41 | ||
@@ -46,6 +48,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface | |||
46 | $emptyConfig->setLanguage('en'); | 48 | $emptyConfig->setLanguage('en'); |
47 | $emptyConfig->setPocketConsumerKey(null); | 49 | $emptyConfig->setPocketConsumerKey(null); |
48 | $emptyConfig->setActionMarkAsRead(0); | 50 | $emptyConfig->setActionMarkAsRead(0); |
51 | $emptyConfig->setListMode(0); | ||
49 | 52 | ||
50 | $manager->persist($emptyConfig); | 53 | $manager->persist($emptyConfig); |
51 | 54 | ||
diff --git a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php b/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php index 3a3da024..006a18c3 100644 --- a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php +++ b/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php | |||
@@ -41,6 +41,12 @@ class Configuration implements ConfigurationInterface | |||
41 | ->end() | 41 | ->end() |
42 | ->scalarNode('fetching_error_message') | 42 | ->scalarNode('fetching_error_message') |
43 | ->end() | 43 | ->end() |
44 | ->scalarNode('action_mark_as_read') | ||
45 | ->defaultValue(1) | ||
46 | ->end() | ||
47 | ->scalarNode('list_mode') | ||
48 | ->defaultValue(1) | ||
49 | ->end() | ||
44 | ->end() | 50 | ->end() |
45 | ; | 51 | ; |
46 | 52 | ||
diff --git a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php index b4992d54..aa9ee339 100644 --- a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php +++ b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php | |||
@@ -23,6 +23,8 @@ class WallabagCoreExtension extends Extension | |||
23 | $container->setParameter('wallabag_core.version', $config['version']); | 23 | $container->setParameter('wallabag_core.version', $config['version']); |
24 | $container->setParameter('wallabag_core.paypal_url', $config['paypal_url']); | 24 | $container->setParameter('wallabag_core.paypal_url', $config['paypal_url']); |
25 | $container->setParameter('wallabag_core.cache_lifetime', $config['cache_lifetime']); | 25 | $container->setParameter('wallabag_core.cache_lifetime', $config['cache_lifetime']); |
26 | $container->setParameter('wallabag_core.action_mark_as_read', $config['action_mark_as_read']); | ||
27 | $container->setParameter('wallabag_core.list_mode', $config['list_mode']); | ||
26 | $container->setParameter('wallabag_core.fetching_error_message', $config['fetching_error_message']); | 28 | $container->setParameter('wallabag_core.fetching_error_message', $config['fetching_error_message']); |
27 | 29 | ||
28 | $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); | 30 | $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); |