From 94e502c12b3f99f509e4d8024a8c18fdca889f3b Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Wed, 23 Jul 2014 15:31:41 +0200
Subject: [PATCH] PHRAS-211 #fix status not applied

---
 templates/web/client/answers.html.twig      |  2 +-
 templates/web/prod/results/record.html.twig |  2 +-
 templates/web/prod/upload/upload.html.twig  | 16 +++++++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/templates/web/client/answers.html.twig b/templates/web/client/answers.html.twig
index 06cf2cf43d..a6cfb771d8 100644
--- a/templates/web/client/answers.html.twig
+++ b/templates/web/client/answers.html.twig
@@ -144,7 +144,7 @@
                 {% else %}
                     <td class="w160px">
                 {% endif %}
-                    <div class="diapo w160px" style="margin-bottom:0;border-bottom:none;overflow:hidden;">
+                    <div class="diapo w160px" style="margin-bottom:0;border-bottom:none;">
                         <div class="title" style="max-height:100%" title="{{ record.get_title() }}">{{ record.get_title() }}</div>
                         <div class="status">{{ record.get_status_icons()|raw }}</div>
                         <table cellpadding="0" cellspacing="0" style="margin: 0pt auto;">
diff --git a/templates/web/prod/results/record.html.twig b/templates/web/prod/results/record.html.twig
index 352f68f294..f2c96a2175 100644
--- a/templates/web/prod/results/record.html.twig
+++ b/templates/web/prod/results/record.html.twig
@@ -21,7 +21,7 @@
             onDblClick="openPreview('RESULT',{{record.get_number}});">
     {% endif %}
         <div style="padding: 4px;">
-            <div style="height:40px; position: relative; z-index: 95;margin-bottom:0;border-bottom:none;overflow:hidden;">
+            <div style="height:40px; position: relative; z-index: 95;margin-bottom:0;border-bottom:none;">
                 <div class="title" style="max-height:100%" title="{{ record.get_title() }}">
                     {{ record.get_title() }}
                 </div>
diff --git a/templates/web/prod/upload/upload.html.twig b/templates/web/prod/upload/upload.html.twig
index f40b31bf09..5c153c36b2 100644
--- a/templates/web/prod/upload/upload.html.twig
+++ b/templates/web/prod/upload/upload.html.twig
@@ -394,13 +394,19 @@ $(document).ready(function () {
     //on submit file
     $('#fileupload', UploaderManager.getContainer()).bind('fileuploadsubmit', function (e, data) {
         var $this = $(this);
+        var params = [];
+        data.formData = [];
 
         //get form datas attached to the file
-        data.formData = $.extend(
-            data.context.find('input, select').serializeArray(),
-            $("input", $('.collection-status:visible', UploaderManager.getSettingsBox())).serializeArray(),
-            $("select", UploaderManager.getSettingsBox()).serializeArray()
-        );
+        params.push(data.context.find('input, select').serializeArray());
+        params.push($("input", $('.collection-status:visible', UploaderManager.getSettingsBox())).serializeArray());
+        params.push($("select", UploaderManager.getSettingsBox()).serializeArray());
+
+        $.each(params, function(i, p) {
+            $.each(p, function (i, f){
+                data.formData.push(f);
+            });
+        });
 
         data.formData.push({
             "name": "b64_image",