devol
/
wallabag
mirror of https://github.com/wallabag/wallabag.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Put default fetching error title in global config

This commit is contained in:
Jerome Charaoui 2016-12-06 22:27:08 -05:00 committed by Jeremy Benoist
parent 7aba665e48
commit 1c5da417e4
No known key found for this signature in database
GPG Key ID: FB413A58C7715C86
5 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/config/config.yml
View File

@ -58,6 +58,7 @@ wallabag_core:
cache_lifetime: 10 cache_lifetime: 10
action_mark_as_read: 1 action_mark_as_read: 1
list_mode: 0 list_mode: 0
fetching_error_message_title: 'No title found'
fetching_error_message: | fetching_error_message: |
wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>. wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
api_limit_mass_actions: 10 api_limit_mass_actions: 10

3
src/Wallabag/CoreBundle/Controller/EntryController.php
View File

@ -60,9 +60,6 @@ class EntryController extends Controller
*/ */
private function updateEntry(Entry $entry, $prefixMessage = 'entry_saved') private function updateEntry(Entry $entry, $prefixMessage = 'entry_saved')
{ {
// put default title in case of fetching content failed
$entry->setTitle('No title found');
$message = 'flashes.entry.notice.'.$prefixMessage; $message = 'flashes.entry.notice.'.$prefixMessage;
try { try {

2
src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
View File

@ -41,6 +41,8 @@ class Configuration implements ConfigurationInterface
->end() ->end()
->scalarNode('fetching_error_message') ->scalarNode('fetching_error_message')
->end() ->end()
->scalarNode('fetching_error_message_title')
->end()
->scalarNode('action_mark_as_read') ->scalarNode('action_mark_as_read')
->defaultValue(1) ->defaultValue(1)
->end() ->end()

1
src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
View File

@ -26,6 +26,7 @@ class WallabagCoreExtension extends Extension
$container->setParameter('wallabag_core.action_mark_as_read', $config['action_mark_as_read']); $container->setParameter('wallabag_core.action_mark_as_read', $config['action_mark_as_read']);
$container->setParameter('wallabag_core.list_mode', $config['list_mode']); $container->setParameter('wallabag_core.list_mode', $config['list_mode']);
$container->setParameter('wallabag_core.fetching_error_message', $config['fetching_error_message']); $container->setParameter('wallabag_core.fetching_error_message', $config['fetching_error_message']);
$container->setParameter('wallabag_core.fetching_error_message_title', $config['fetching_error_message_title']);
$container->setParameter('wallabag_core.api_limit_mass_actions', $config['api_limit_mass_actions']); $container->setParameter('wallabag_core.api_limit_mass_actions', $config['api_limit_mass_actions']);
$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));

1
src/Wallabag/CoreBundle/Resources/config/services.yml
View File

@ -41,6 +41,7 @@ services:
arguments: arguments:
- -
error_message: '%wallabag_core.fetching_error_message%' error_message: '%wallabag_core.fetching_error_message%'
error_message_title: '%wallabag_core.fetching_error_message_title%'
- "@wallabag_core.guzzle.http_client" - "@wallabag_core.guzzle.http_client"
- "@wallabag_core.graby.config_builder" - "@wallabag_core.graby.config_builder"
calls: calls: