Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Julien Fastré 2019-05-02 22:46:45 +02:00
commit cd855c2241
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -35,9 +35,13 @@ Version 1.5.5
- add api for grouping centers ; - add api for grouping centers ;
- select centers as grouped on step "pick centers" in exports ; - 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. - 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. - 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 ;

7
Controller/ExportController.php
View File

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

5
Resources/views/Export/download.html.twig
View File

@ -18,7 +18,7 @@
{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %} {% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
{% block title "Download export"|trans %} {% block title "Download export"|trans ~ export.title|trans %}
{% block js %} {% block js %}
<script type="text/javascript"> <script type="text/javascript">
@ -35,7 +35,8 @@ window.addEventListener("DOMContentLoaded", function(e) {
{% block layout_wvm_content %} {% 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> <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>