fix #1620 and introduce new parameters to export

diff --git a/app/config/config.yml b/app/config/config.yml
index 5d9c7c55893a3c2e45d09040fb304d57690f37b0..2ec44f991b18b3be998277e7b21cfc91aabc2e9e 100644 (file)
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -56,6 +56,10 @@ twig:
         export_epub: %export_epub%
         export_mobi: %export_mobi%
         export_pdf: %export_pdf%
+        export_csv: %export_csv%
+        export_json: %export_json%
+        export_txt: %export_txt%
+        export_xml: %export_xml%
         version: %app.version%
         twofactor_auth: %twofactor_auth%
         warning_message: %warning_message%

diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 0c0cbff1cdc7a79be80a039e7663cea60bffaaa6..e4fcbd743c1d3f710ea821caef1c07ddf0524859 100644 (file)
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -61,6 +61,10 @@ parameters:
     export_epub: true
     export_mobi: true
     export_pdf: true
+    export_csv: true
+    export_json: true
+    export_txt: true
+    export_xml: true
     wallabag_url: http://v2.wallabag.org
     wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
 

diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
index 88b1d2b40afcd8203e3a70d99da012aef14d85b6..f902f239522942d7e3fa17d7bb7a77bc88727ebd 100644 (file)
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -51,6 +51,10 @@ parameters:
     export_epub: true
     export_mobi: true
     export_pdf: true
+    export_csv: true
+    export_json: true
+    export_txt: true
+    export_xml: true
     wallabag_url: http://v2.wallabag.org
     wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
 

diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
index 3c61142dd0c8987298f8f802d56721c35b8ec0ac..76685b141c42e0ddc642aa1a8b6a54d5f2ccd491 100644 (file)
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -51,6 +51,10 @@ parameters:
     export_epub: true
     export_mobi: true
     export_pdf: true
+    export_csv: true
+    export_json: true
+    export_txt: true
+    export_xml: true
     wallabag_url: http://v2.wallabag.org
     wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
 

diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite
index 2f7699b5795fb5f436f460503bea7e50c24bbd37..cdafb1b1bb6bcb0ec58926a3a1863d16617b0dbb 100644 (file)
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -51,6 +51,10 @@ parameters:
     export_epub: true
     export_mobi: true
     export_pdf: true
+    export_csv: true
+    export_json: true
+    export_txt: true
+    export_xml: true
     wallabag_url: http://v2.wallabag.org
     wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
 

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index bf38bff8245e839d53c6cbb71fdd229e58836501..6de800b94fb57d94b4aabf3148f9b1f111c49aae 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -99,13 +99,13 @@
     {% endif %}
         <h4 class="center">{% trans %}Export{% endtrans %}</h4>
         <ul>
-            <li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'epub' }) }}">{% trans %}EPUB{% endtrans %}</a></li>
-            <li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'mobi' }) }}">{% trans %}MOBI{% endtrans %}</a></li>
-            <li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'pdf' }) }}">{% trans %}PDF{% endtrans %}</a></li>
-            <li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'xml' }) }}">{% trans %}XML{% endtrans %}</a></li>
-            <li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'json' }) }}">{% trans %}JSON{% endtrans %}</a></li>
-            <li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'csv' }) }}">{% trans %}CSV{% endtrans %}</a></li>
-            <li class="bold"><del><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'txt' }) }}">{% trans %}TXT{% endtrans %}</a></del></li>
+            {% if export_epub %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'epub' }) }}">{% trans %}EPUB{% endtrans %}</a></li>{% endif %}
+            {% if export_mobi %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'mobi' }) }}">{% trans %}MOBI{% endtrans %}</a></li>{% endif %}
+            {% if export_pdf %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'pdf' }) }}">{% trans %}PDF{% endtrans %}</a></li>{% endif %}
+            {% if export_xml %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'xml' }) }}">{% trans %}XML{% endtrans %}</a></li>{% endif %}
+            {% if export_csv %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'json' }) }}">{% trans %}JSON{% endtrans %}</a></li>{% endif %}
+            {% if export_json %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'csv' }) }}">{% trans %}CSV{% endtrans %}</a></li>{% endif %}
+            {% if export_txt %}<li class="bold"><del><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'txt' }) }}">{% trans %}TXT{% endtrans %}</a></del></li>{% endif %}
         </ul>
     </div>
 

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
index 095ff7b3eadfedaebc34bca30c272fd430dea1e3..31963ae826ad2ecdc5f1d682d01296dce21ef4f4 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
@@ -117,9 +117,10 @@
                     {% if export_epub %}<li><a href="{{ path('export_entry', { 'id': entry.id, 'format': 'epub' }) }}" title="Generate ePub file">EPUB</a></li>{% endif %}
                     {% if export_mobi %}<li><a href="{{ path('export_entry', { 'id': entry.id, 'format': 'mobi' }) }}" title="Generate Mobi file">MOBI</a></li>{% endif %}
                     {% if export_pdf %}<li><a href="{{ path('export_entry', { 'id': entry.id, 'format': 'pdf' }) }}" title="Generate PDF file">PDF</a></li>{% endif %}
-                    <li><a href="{{ path('export_entry', { 'id': entry.id, 'format': 'csv' }) }}" title="Generate CSV file">CSV</a></li>
-                    <li><a href="{{ path('export_entry', { 'id': entry.id, 'format': 'json' }) }}" title="Generate JSON file">JSON</a></li>
-                    <li><a href="{{ path('export_entry', { 'id': entry.id, 'format': 'xml' }) }}" title="Generate XML file">XML</a></li>
+                    {% if export_csv %}<li><a href="{{ path('export_entry', { 'id': entry.id, 'format': 'csv' }) }}" title="Generate CSV file">CSV</a></li>{% endif %}
+                    {% if export_json %}<li><a href="{{ path('export_entry', { 'id': entry.id, 'format': 'json' }) }}" title="Generate JSON file">JSON</a></li>{% endif %}
+                    {% if export_txt %}<li><del><a href="{{ path('export_entry', { 'id': entry.id, 'format': 'txt' }) }}" title="Generate TXT file">TXT</a></del></li>{% endif %}
+                    {% if export_xml %}<li><a href="{{ path('export_entry', { 'id': entry.id, 'format': 'xml' }) }}" title="Generate XML file">XML</a></li>{% endif %}
                 </ul>
             </div>
         </li>