From 7c371a11cd0d4a566e9f09a9de2cb59f7b1c4d4c Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Fri, 25 May 2012 19:41:22 +0200
Subject: [PATCH] fix #644 Status off by default

---
 lib/Alchemy/Phrasea/Controller/Prod/Upload.php | 5 +++--
 templates/web/prod/upload/upload.html.twig     | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Upload.php b/lib/Alchemy/Phrasea/Controller/Prod/Upload.php
index 14b96f4707..3e0f39376a 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Upload.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Upload.php
@@ -167,8 +167,9 @@ class Upload implements ControllerProviderInterface
 
             $postStatus = $request->get('status');
 
-            if (is_array($postStatus)) {
-
+            if (isset($postStatus[$collection->get_sbas_id()]) && is_array($postStatus[$collection->get_sbas_id()])) {
+                $postStatus = $postStatus[$collection->get_sbas_id()];
+                
                 $status = '';
                 foreach (range(0, 64) as $i) {
                     $status .= isset($postStatus[$i]) ? ($postStatus[$i] ? '1' : '0') : '0';
diff --git a/templates/web/prod/upload/upload.html.twig b/templates/web/prod/upload/upload.html.twig
index e85380eef2..9ff9949046 100644
--- a/templates/web/prod/upload/upload.html.twig
+++ b/templates/web/prod/upload/upload.html.twig
@@ -67,10 +67,10 @@
                                                             <img src="{{ status['img_off'] }}" width="16" height="16" />
                                                         {% endif %}
                                                         <span>{{ status['labeloff']|default('off') }}</span>
-                                                        <input type="radio" name="status[{{ bit }}]" value="off" checked="checked"/>
+                                                        <input type="radio" name="status[{{ collection.get_base_id() }}][{{ bit }}]" value="off" checked="checked"/>
                                                     </td>
                                                     <td class="status-tab-right">
-                                                        <input type="radio" name="status[{{ bit }}]" value="on" />
+                                                        <input type="radio" name="status[{{ collection.get_base_id() }}][{{ bit }}]" value="on" />
                                                         <span for="labelon">{{ status['labelon']|default('on') }}</span>
                                                         {% if status['img_on'] is not empty %}
                                                             <img src="{{ status['img_on'] }}" width="16" height="16" />