From 73eb344019c1345e1c91483846f3396f6fa792ca Mon Sep 17 00:00:00 2001 From: Florian BLOUET Date: Fri, 1 Apr 2016 15:14:48 +0200 Subject: [PATCH] Bump Phraseanet production client - fix search form and light refactoring - fix double download - misc fixes --- package.json | 2 +- templates/web/prod/actions/Download/prepare.html.twig | 4 ++-- templates/web/prod/index.html.twig | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a03c71ef68..c6cf8c3ea6 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,6 @@ "postinstall": "./node_modules/.bin/gulp install;" }, "dependencies": { - "phraseanet-production-client": "~0.10.0" + "phraseanet-production-client": "~0.11.0" } } diff --git a/templates/web/prod/actions/Download/prepare.html.twig b/templates/web/prod/actions/Download/prepare.html.twig index a55fa492c9..89eceba38e 100644 --- a/templates/web/prod/actions/Download/prepare.html.twig +++ b/templates/web/prod/actions/Download/prepare.html.twig @@ -108,16 +108,16 @@ $.post("{{ path('execute_download', {'token': token.getValue(), 'type': type, 'anonymous': anonymous}) }}", function(data){ if(data.success) { $('form[name=download]').submit(); + } else { + setTimeout("location.reload()", "{{ time ~ "000" }}"); } return false; }); - setTimeout("location.reload()", "{{ time ~ "000" }}"); {% elseif (list['complete'] is defined and list['complete'])%} {# Zip done #} // Get files $('form[name=download]').submit(); {% else %} - setTimeout("location.reload()", "{{ time ~ "000" }}"); {% endif %} }); diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index 50c3e50ae6..c239959da5 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -213,8 +213,7 @@ - -