diff --git a/VERSIONS_STABLE/11217 b/VERSIONS_STABLE/11217 new file mode 100644 index 0000000000000000000000000000000000000000..da1dfb874fe5e15c59b4d925faa5c0e6d57898ad --- /dev/null +++ b/VERSIONS_STABLE/11217 @@ -0,0 +1 @@ + * ticket #11217 : indexation à la volée des notices de la bibliothèque numérique. \ No newline at end of file diff --git a/application/modules/admin/controllers/UploadController.php b/application/modules/admin/controllers/UploadController.php index 7cdda950caa6daadc35e9a0151011d4a30468bcb..28c6de9d22d8a787e2cbc739ea9a482da32701a0 100644 --- a/application/modules/admin/controllers/UploadController.php +++ b/application/modules/admin/controllers/UploadController.php @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE * along with BOKEH; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ class Admin_UploadController extends Zend_Controller_Action { public function preDispatch(){ @@ -65,8 +65,11 @@ $(document).ready(function () { return; } - $this->_helper->json($model->addFile($this->_request)); + + $result = $model->addFile($this->_request); $model->save(); + $model->index(); + $this->_helper->json($result); return; } diff --git a/tests/application/modules/admin/controllers/UploadControllerTest.php b/tests/application/modules/admin/controllers/UploadControllerTest.php index 889f4d626fe506eeba5d12ef03112059e49e2358..a7f841b28693e0bcc36ab0d13dd210dbba980fb7 100644 --- a/tests/application/modules/admin/controllers/UploadControllerTest.php +++ b/tests/application/modules/admin/controllers/UploadControllerTest.php @@ -42,6 +42,9 @@ class UploadControllerMultipleActionTest extends AbstractControllerTestCase { class UploadControllerMultipleProcessPostAction extends AbstractControllerTestCase { + protected + $_storm_default_to_volatile=true; + /** @test */ public function withEmptyRequestResponseShouldContainError() { $this->dispatch('/admin/upload/multiple-process'); @@ -95,6 +98,7 @@ class UploadControllerMultipleProcessPostAction extends AbstractControllerTestCa public function withModelShouldCallFileProcessingMethod() { $album = Storm_Test_ObjectWrapper::on(Class_Album::getLoader()->newInstance()) ->whenCalled('addFile')->answers(array('success' => 'true')) + ->whenCalled('index')->answers(null) ->getWrapper(); Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Album') @@ -130,6 +134,15 @@ class UploadControllerMultipleProcessPostAction extends AbstractControllerTestCa } + /** + * @depends withModelShouldCallFileProcessingMethod + * @test + */ + public function albumShouldHaveBeenIndexed($album) { + $this->assertTrue($album->methodHasBeenCalled('index')); + } + + /** * @depends withModelShouldCallFileProcessingMethod * @test