diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-10-21 15:22:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-21 15:22:11 +0200 |
commit | e8331dd9e7772a396bb211459eca4a682c8e947e (patch) | |
tree | 7258769d31ae352ba1021b7e87fc8aa3bf2d80cf /app | |
parent | 61477368687e048f3001336327923f5c87fa2592 (diff) | |
parent | 5960aa1ffc8ee07850d4865a8df7440750af4b2b (diff) | |
download | wallabag-e8331dd9e7772a396bb211459eca4a682c8e947e.tar.gz wallabag-e8331dd9e7772a396bb211459eca4a682c8e947e.tar.zst wallabag-e8331dd9e7772a396bb211459eca4a682c8e947e.zip |
Merge pull request #2453 from wallabag/fix-api-export
Fix API export
Diffstat (limited to 'app')
-rw-r--r-- | app/config/config.yml | 27 | ||||
-rw-r--r-- | app/config/routing_rest.yml | 5 |
2 files changed, 27 insertions, 5 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 2f102c45..b4760073 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -112,12 +112,26 @@ swiftmailer: | |||
112 | fos_rest: | 112 | fos_rest: |
113 | param_fetcher_listener: true | 113 | param_fetcher_listener: true |
114 | body_listener: true | 114 | body_listener: true |
115 | format_listener: true | ||
116 | view: | 115 | view: |
116 | mime_types: | ||
117 | csv: | ||
118 | - 'text/csv' | ||
119 | - 'text/plain' | ||
120 | pdf: | ||
121 | - 'application/pdf' | ||
122 | epub: | ||
123 | - 'application/epub+zip' | ||
124 | mobi: | ||
125 | - 'application/x-mobipocket-ebook' | ||
117 | view_response_listener: 'force' | 126 | view_response_listener: 'force' |
118 | formats: | 127 | formats: |
119 | xml: true | 128 | xml: true |
120 | json : true | 129 | json: true |
130 | txt: true | ||
131 | csv: true | ||
132 | pdf: true | ||
133 | epub: true | ||
134 | mobi: true | ||
121 | templating_formats: | 135 | templating_formats: |
122 | html: true | 136 | html: true |
123 | force_redirects: | 137 | force_redirects: |
@@ -126,6 +140,15 @@ fos_rest: | |||
126 | default_engine: twig | 140 | default_engine: twig |
127 | routing_loader: | 141 | routing_loader: |
128 | default_format: json | 142 | default_format: json |
143 | format_listener: | ||
144 | enabled: true | ||
145 | rules: | ||
146 | - { path: "^/api/entries/([0-9]+)/export.(.*)", priorities: ['epub', 'mobi', 'pdf', 'txt', 'csv'], fallback_format: false, prefer_extension: false } | ||
147 | - { path: "^/api", priorities: ['json', 'xml'], fallback_format: false, prefer_extension: false } | ||
148 | - { path: "^/annotations", priorities: ['json', 'xml'], fallback_format: false, prefer_extension: false } | ||
149 | # for an unknown reason, EACH REQUEST goes to FOS\RestBundle\EventListener\FormatListener | ||
150 | # so we need to add custom rule for custom api export but also for all other routes of the application... | ||
151 | - { path: '^/', priorities: ['text/html', '*/*'], fallback_format: html, prefer_extension: false } | ||
129 | 152 | ||
130 | nelmio_api_doc: | 153 | nelmio_api_doc: |
131 | sandbox: | 154 | sandbox: |
diff --git a/app/config/routing_rest.yml b/app/config/routing_rest.yml index 52d395dd..29f4ab14 100644 --- a/app/config/routing_rest.yml +++ b/app/config/routing_rest.yml | |||
@@ -1,4 +1,3 @@ | |||
1 | Rest_Wallabag: | 1 | Rest_Wallabag: |
2 | type : rest | 2 | type : rest |
3 | resource: "@WallabagApiBundle/Resources/config/routing_rest.yml" | 3 | resource: "@WallabagApiBundle/Resources/config/routing_rest.yml" |
4 | |||