diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Bridge.php b/lib/Alchemy/Phrasea/Controller/Prod/Bridge.php index bf91de5734..305802cce8 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Bridge.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Bridge.php @@ -63,6 +63,7 @@ class Bridge implements ControllerProviderInterface 'user_accounts' => \Bridge_Account::get_accounts_by_user($appbox, $user) , 'available_apis' => \Bridge_Api::get_availables($appbox) , 'route' => $route + , 'current_account_id' => '' ); return new Response($twig->render('prod/actions/Bridge/index.twig', $params) diff --git a/lib/conf.d/_GV_template.inc b/lib/conf.d/_GV_template.inc index 9e9ada3840..d210fcc941 100644 --- a/lib/conf.d/_GV_template.inc +++ b/lib/conf.d/_GV_template.inc @@ -19,8 +19,8 @@ foreach ($lngs as $lng => $locales) $avLanguages[$loc] = $locname['name']; } } - $eventsmanager = eventsmanager_broker::getInstance(appbox::get_instance()); +$eventsmanager = eventsmanager_broker::getInstance(appbox::get_instance(), bootstrap::getCore()); $PHP_CONF = array( 'output_buffering' => '4096' //INI_ALL diff --git a/lib/unitTest/Bridge/ApplicationTest.php b/lib/unitTest/Bridge/ApplicationTest.php index 03ad1c4590..3d9eb39d77 100644 --- a/lib/unitTest/Bridge/ApplicationTest.php +++ b/lib/unitTest/Bridge/ApplicationTest.php @@ -75,7 +75,7 @@ class Bridge_Application extends PhraseanetWebTestCaseAuthenticatedAbstract $crawler = $this->client->request('POST', '/bridge/manager/', array('ssel' => $basket->getId())); $pageContent = $this->client->getResponse()->getContent(); - $this->assertNotContains("Oups ! something went wrong !", $pageContent); + $this->assertTrue($this->client->getResponse()->isOk()); $this->assertEquals(count($accounts) + 2, $crawler->filter('form')->count()); $this->assertTrue($this->client->getResponse()->isOk()); } diff --git a/templates/web/prod/actions/Bridge/wrapper.twig b/templates/web/prod/actions/Bridge/wrapper.twig index 4b35498b51..4a608a0571 100644 --- a/templates/web/prod/actions/Bridge/wrapper.twig +++ b/templates/web/prod/actions/Bridge/wrapper.twig @@ -19,7 +19,7 @@ {% if not loop.last %} - {% endif %} {% endfor %} |  - + {% trans 'Fichiers envoyes' %}