hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #193 from nlegoff/fix_upload_status

Browse Source 
Fix #868 upload status on 3.7
This commit is contained in:
Romain Neutron
2012-08-31 07:33:51 -07:00
parent 2d9c97787f 9b6fcf58c9
commit ccc280e45b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/Controller/Prod/Upload.php
View File

@@ -201,8 +201,8 @@ class Upload implements ControllerProviderInterface
$postStatus = $request->get('status');
if (isset($postStatus[$collection->get_sbas_id()]) && is_array($postStatus[$collection->get_sbas_id()])) {
$postStatus = $postStatus[$collection->get_sbas_id()];
if (isset($postStatus[$collection->get_base_id()]) && is_array($postStatus[$collection->get_base_id()])) {
$postStatus = $postStatus[$collection->get_base_id()];
$status = '';
foreach (range(0, 63) as $i) {

2
tests/Alchemy/Phrasea/Controller/Prod/UploadTest.php
View File

@@ -248,7 +248,7 @@ class UploadTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
$params = array(
'base_id' => self::$collection->get_base_id(),
'forceAction' => \Alchemy\Phrasea\Border\Manager::FORCE_RECORD,
'status' => array( self::$collection->get_sbas_id() => array( 4 => 1)),
'status' => array( self::$collection->get_base_id() => array( 4 => 1)),
);
$files = array(