Merge branch 'stable'

CHANGELOG.md

@@ -35,9 +35,13 @@ Version 1.5.5
 - add api for grouping centers ;
 - select centers as grouped on step "pick centers" in exports ;
 
-Master branch
+Version 1.5.6
 =============
 
 - fix long url in report download. The exports parameters are now stored in redis.
 - add an option to allow address to be empty if street or postcode is not set. Used for embedding address in another form, when address is not required.
 
+Branche de développement
+========================
+
+- insert the title of the export inside the "download" page ;

Controller/ExportController.php

@@ -483,12 +483,12 @@ class ExportController extends Controller
     protected function rebuildData($key)
     {
         if ($key === NULL) {
-            throw $this->createHttpNotFoundException("key does not exists");
+            throw $this->createNotFoundException("key does not exists");
         }
         
         if ($this->redis->exists($key) !== 1) {
             $this->addFlash('error', $this->translator->trans("This report is not available any more"));
-            throw $this->createHttpNotFoundException("key does not exists");
+            throw $this->createNotFoundException("key does not exists");
         }
         
         $serialized = $this->redis->get($key);
@@ -534,7 +534,8 @@ class ExportController extends Controller
         }
         
         $viewVariables = [
-            'alias' => $alias
+            'alias' => $alias,
+            'export' => $exportManager->getExport($alias)
         ];
         
         if ($formater instanceof \Chill\MainBundle\Export\Formatter\CSVListFormatter) {

Resources/views/Export/download.html.twig

@@ -18,7 +18,7 @@
 
 {% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
 
-{% block title "Download export"|trans %}
+{% block title "Download export"|trans ~ export.title|trans %}
     
 {% block js %}
 <script type="text/javascript">
@@ -35,7 +35,8 @@ window.addEventListener("DOMContentLoaded", function(e) {
  
 {% block layout_wvm_content  %}
     
-    <h1>{{ "Download export"|trans }}</h1>
+    <h1>{{ export.title|trans }}</h1>
+    <h2>{{ "Download export"|trans }}</h2>
     
     <div id="download_container" data-alias="{{ alias|escape('html_attr') }}" {% if mime_type is defined %}data-mime-type="{{ mime_type|escape('html_attr') }}"{% endif %} data-download-text="{{ "Download your report"|trans|escape('html_attr') }}"><span id="waiting_text">{{ "Waiting for your report"|trans }}...</span></div>