From 9b6fcf58c99608180c980851ba20ab1415bda626 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Fri, 31 Aug 2012 15:37:26 +0200 Subject: [PATCH] Fix #868 Status are not applicate when uploading a file --- lib/Alchemy/Phrasea/Controller/Prod/Upload.php | 4 ++-- tests/Alchemy/Phrasea/Controller/Prod/UploadTest.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Upload.php b/lib/Alchemy/Phrasea/Controller/Prod/Upload.php index 0525b4cf05..7592902408 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Upload.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Upload.php @@ -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) { diff --git a/tests/Alchemy/Phrasea/Controller/Prod/UploadTest.php b/tests/Alchemy/Phrasea/Controller/Prod/UploadTest.php index 92451faa4f..640a99b1a2 100644 --- a/tests/Alchemy/Phrasea/Controller/Prod/UploadTest.php +++ b/tests/Alchemy/Phrasea/Controller/Prod/UploadTest.php @@ -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(