diff options
| author | Nicolas Lœuillet <nicolas.loeuillet@smile.fr> | 2016-01-20 14:37:01 +0100 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas.loeuillet@smile.fr> | 2016-01-20 14:37:01 +0100 |
| commit | 6785f4aa749e381081b93e3db46424cc7475eab8 (patch) | |
| tree | f8fb914c4febb93ee229c4b13f2488ee0c9fe2fc /src/Wallabag/ImportBundle/Resources | |
| parent | d481f42b7d383eb6211d1d3049d1a2c8288d9edb (diff) | |
| download | wallabag-6785f4aa749e381081b93e3db46424cc7475eab8.tar.gz wallabag-6785f4aa749e381081b93e3db46424cc7475eab8.tar.zst wallabag-6785f4aa749e381081b93e3db46424cc7475eab8.zip | |
[#1590] Add JSON import from wallabag v2
Diffstat (limited to 'src/Wallabag/ImportBundle/Resources')
| -rw-r--r-- | src/Wallabag/ImportBundle/Resources/config/services.yml | 9 | ||||
| -rw-r--r-- | src/Wallabag/ImportBundle/Resources/views/WallabagV2/index.html.twig | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/Wallabag/ImportBundle/Resources/config/services.yml b/src/Wallabag/ImportBundle/Resources/config/services.yml index e4dde100..6a11892e 100644 --- a/src/Wallabag/ImportBundle/Resources/config/services.yml +++ b/src/Wallabag/ImportBundle/Resources/config/services.yml | |||
| @@ -32,3 +32,12 @@ services: | |||
| 32 | - [ setLogger, [ "@logger" ]] | 32 | - [ setLogger, [ "@logger" ]] |
| 33 | tags: | 33 | tags: |
| 34 | - { name: wallabag_import.import, alias: wallabag_v1 } | 34 | - { name: wallabag_import.import, alias: wallabag_v1 } |
| 35 | |||
| 36 | wallabag_import.wallabag_v2.import: | ||
| 37 | class: Wallabag\ImportBundle\Import\WallabagV2Import | ||
| 38 | arguments: | ||
| 39 | - "@doctrine.orm.entity_manager" | ||
| 40 | calls: | ||
| 41 | - [ setLogger, [ "@logger" ]] | ||
| 42 | tags: | ||
| 43 | - { name: wallabag_import.import, alias: wallabag_v2 } | ||
diff --git a/src/Wallabag/ImportBundle/Resources/views/WallabagV2/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/WallabagV2/index.html.twig new file mode 100644 index 00000000..78fe67e4 --- /dev/null +++ b/src/Wallabag/ImportBundle/Resources/views/WallabagV2/index.html.twig | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | {% extends "WallabagImportBundle:WallabagV1:index.html.twig" %} | ||
| 2 | {% block title %}{% trans %}Import > Wallabag v2{% endtrans %}{% endblock %} | ||