mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-26 19:11:07 +00:00
Code Issues Projects Releases Wiki Activity

Review

Browse source
This commit is contained in:
Jeremy Benoist 2017-06-08 19:15:33 +02:00
parent e48b238a3e
commit 80f4d85ac9
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
8 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/DoctrineMigrations/Version20170606155640.php
View file

@ -8,7 +8,8 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\ContainerInterface;
/** /**
* Add api_user_registration in craue_config_setting. * Remove wallabag_url from craue_config_setting.
* It has been moved into the parameters.yml
*/ */
class Version20170606155640 extends AbstractMigration implements ContainerAwareInterface class Version20170606155640 extends AbstractMigration implements ContainerAwareInterface
{ {

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

@ -23,7 +23,7 @@ parameters:
# with PostgreSQL and SQLite, you must set "utf8" # with PostgreSQL and SQLite, you must set "utf8"
database_charset: utf8mb4 database_charset: utf8mb4
domain_name: wallabag.me domain_name: http://your-wallabag-url-instance.com
mailer_transport: smtp mailer_transport: smtp
mailer_host: 127.0.0.1 mailer_host: 127.0.0.1

1
app/config/parameters_test.yml
View file

@ -8,4 +8,3 @@ parameters:
test_database_path: "%env(TEST_DATABASE_PATH)%" test_database_path: "%env(TEST_DATABASE_PATH)%"
env(TEST_DATABASE_PATH): "%kernel.root_dir%/../data/db/wallabag_test.sqlite" env(TEST_DATABASE_PATH): "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
test_database_charset: utf8 test_database_charset: utf8
domain_name: 'http://v2.wallabag.org'

1
app/config/wallabag.yml
View file

@ -26,7 +26,6 @@ wallabag_core:
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
domain_name: '%domain_name%'
default_internal_settings: default_internal_settings:
- -
name: share_public name: share_public

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

@ -63,8 +63,6 @@ class Configuration implements ConfigurationInterface
->end() ->end()
->end() ->end()
->end() ->end()
->scalarNode('domain_name')
->end()
->end() ->end()
; ;

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

@ -29,7 +29,6 @@ class WallabagCoreExtension extends Extension
$container->setParameter('wallabag_core.fetching_error_message_title', $config['fetching_error_message_title']); $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']);
$container->setParameter('wallabag_core.default_internal_settings', $config['default_internal_settings']); $container->setParameter('wallabag_core.default_internal_settings', $config['default_internal_settings']);
$container->setParameter('wallabag_core.domain_name', $config['domain_name']);
$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader->load('services.yml'); $loader->load('services.yml');

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

@ -195,7 +195,7 @@ services:
arguments: arguments:
- "@wallabag_core.entry.download_images.client" - "@wallabag_core.entry.download_images.client"
- "%kernel.root_dir%/../web/assets/images" - "%kernel.root_dir%/../web/assets/images"
- '%wallabag_core.domain_name%' - '%domain_name%'
- "@logger" - "@logger"
wallabag_core.entry.download_images.client: wallabag_core.entry.download_images.client:

2
tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
View file

@ -1000,7 +1000,7 @@ class EntryControllerTest extends WallabagCoreTestCase
$this->assertEquals($url, $entry->getUrl()); $this->assertEquals($url, $entry->getUrl());
$this->assertContains('Perpignan', $entry->getTitle()); $this->assertContains('Perpignan', $entry->getTitle());
// instead of checking for the filename (which might change) check that the image is now local // instead of checking for the filename (which might change) check that the image is now local
$this->assertContains('http://v2.wallabag.org/assets/images/', $entry->getContent()); $this->assertContains('http://your-wallabag-url-instance.com/assets/images/', $entry->getContent());
$client->getContainer()->get('craue_config')->set('download_images_enabled', 0); $client->getContainer()->get('craue_config')->set('download_images_enabled', 0);
} }