Merge branch 'master' into PHRAS-4125_release-4.1.15

Author: nmaillat

Phraseanet-production-client/dist/production.js

@@ -69228,7 +69228,7 @@ var search = function search(services) {
         _.each(_tmpStat, function (v, sbas_id) {
             var status = [];
             _.each(v, function (v, sb_index) {
-                if (v !== -1) {
+                if (!_.isUndefined(v) && v !== -1) {
                     // ignore both checked
                     status.push({
                         'index': sb_index,

Phraseanet-production-client/dist/production.min.js

@@ -69228,7 +69228,7 @@ var search = function search(services) {
         _.each(_tmpStat, function (v, sbas_id) {
             var status = [];
             _.each(v, function (v, sb_index) {
-                if (v !== -1) {
+                if (!_.isUndefined(v) && v !== -1) {
                     // ignore both checked
                     status.push({
                         'index': sb_index,

Phraseanet-production-client/src/components/search/index.js

@@ -491,7 +491,7 @@ const search = services => {
         _.each(_tmpStat, function (v, sbas_id) {
             var status = [];
             _.each(v, function (v, sb_index) {
-                if (v !== -1) {
+                if (!_.isUndefined(v) && v !== -1) {
                     // ignore both checked
                     status.push({
                         'index': sb_index,

lib/Alchemy/Phrasea/Controller/Prod/DownloadController.php

@@ -42,6 +42,10 @@ public function checkDownload(Request $request)
             $this->app->abort(403);
         }
 
+        if (!empty($request->request->get('type'))) {
+            $this->app['session']->set('download_name_type', $request->request->get('type'));
+        }
+
         $lst = $request->request->get('lst');
         $ssttid = $request->request->get('ssttid', '');
         $subdefs = $request->request->get('obj', []);

templates/web/common/dialog_export.html.twig

@@ -61,11 +61,19 @@
         <p>{{ 'Nom des fichiers a l\'export' | trans }}</p>
         <div class="well-small">
             <label for="type_{{id}}_original" class="radio">
-                <input type="radio" name="type" id="type_{{id}}_original" {% if default_export_title == "title" %}checked{% endif %} value="title" />
+                <input type="radio" name="type" id="type_{{id}}_original"
+                       {% if (app['session'].has('download_name_type') and app['session'].get('download_name_type') == "title") or (not app['session'].has('download_name_type') and default_export_title == "title" ) %}
+                           checked
+                       {% endif %}
+                       value="title" />
                 {{ 'export::titre: titre du documument' | trans }}
             </label>
             <label for="type_{{id}}_title" class="radio">
-                <input type="radio" name="type" id="type_{{id}}_title" {% if default_export_title == "original" %}checked{% endif %} value="originalname" />
+                <input type="radio" name="type" id="type_{{id}}_title"
+                       {% if (app['session'].has('download_name_type') and app['session'].get('download_name_type') == "originalname") or (not app['session'].has('download_name_type') and default_export_title == "original" ) %}
+                           checked
+                       {% endif %}
+                       value="originalname" />
                 {{ 'export::titre: nom original du document' | trans }}
             </label>
         </div>