From 6785f4aa749e381081b93e3db46424cc7475eab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 20 Jan 2016 14:37:01 +0100 Subject: [#1590] Add JSON import from wallabag v2 --- src/Wallabag/ImportBundle/Resources/config/services.yml | 9 +++++++++ .../ImportBundle/Resources/views/WallabagV2/index.html.twig | 2 ++ 2 files changed, 11 insertions(+) create mode 100644 src/Wallabag/ImportBundle/Resources/views/WallabagV2/index.html.twig (limited to 'src/Wallabag/ImportBundle/Resources') 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: - [ setLogger, [ "@logger" ]] tags: - { name: wallabag_import.import, alias: wallabag_v1 } + + wallabag_import.wallabag_v2.import: + class: Wallabag\ImportBundle\Import\WallabagV2Import + arguments: + - "@doctrine.orm.entity_manager" + calls: + - [ setLogger, [ "@logger" ]] + tags: + - { 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 @@ +{% extends "WallabagImportBundle:WallabagV1:index.html.twig" %} +{% block title %}{% trans %}Import > Wallabag v2{% endtrans %}{% endblock %} -- cgit v1.2.3