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

Fix build

Browse Source
This commit is contained in:
Romain Neutron
2011-12-29 19:31:45 +01:00
parent adf7e62f20
commit 028b72f271
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Alchemy/Phrasea/Controller/Prod/Bridge.php
View File

@@ -63,6 +63,7 @@ class Bridge implements ControllerProviderInterface
'user_accounts' => \Bridge_Account::get_accounts_by_user($appbox, $user) 'user_accounts' => \Bridge_Account::get_accounts_by_user($appbox, $user)
, 'available_apis' => \Bridge_Api::get_availables($appbox) , 'available_apis' => \Bridge_Api::get_availables($appbox)
, 'route' => $route , 'route' => $route
, 'current_account_id' => ''
); );
return new Response($twig->render('prod/actions/Bridge/index.twig', $params) return new Response($twig->render('prod/actions/Bridge/index.twig', $params)

2
lib/conf.d/_GV_template.inc
View File

@@ -19,8 +19,8 @@ foreach ($lngs as $lng => $locales)
$avLanguages[$loc] = $locname['name']; $avLanguages[$loc] = $locname['name'];
} }
} }
$eventsmanager = eventsmanager_broker::getInstance(appbox::get_instance());
$eventsmanager = eventsmanager_broker::getInstance(appbox::get_instance(), bootstrap::getCore());
$PHP_CONF = array( $PHP_CONF = array(
'output_buffering' => '4096' //INI_ALL 'output_buffering' => '4096' //INI_ALL

2
lib/unitTest/Bridge/ApplicationTest.php
View File

@@ -75,7 +75,7 @@ class Bridge_Application extends PhraseanetWebTestCaseAuthenticatedAbstract
$crawler = $this->client->request('POST', '/bridge/manager/', array('ssel' => $basket->getId())); $crawler = $this->client->request('POST', '/bridge/manager/', array('ssel' => $basket->getId()));
$pageContent = $this->client->getResponse()->getContent(); $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->assertEquals(count($accounts) + 2, $crawler->filter('form')->count());
$this->assertTrue($this->client->getResponse()->isOk()); $this->assertTrue($this->client->getResponse()->isOk());
} }

2
templates/web/prod/actions/Bridge/wrapper.twig
View File

@@ -19,7 +19,7 @@
{% if not loop.last %} - {% endif %} {% if not loop.last %} - {% endif %}
{% endfor %} {% endfor %}
|  | 
<a class="{% if adapter_action == 'load-records' %} selected {% endif %} action_type_{{type}} bridge_action bridge_title" href="/prod/bridge/adapter/{{ account.get_id() }}/load-records/"> <a class="{% if adapter_action == 'load-records' %} selected {% endif %} bridge_action bridge_title" href="/prod/bridge/adapter/{{ account.get_id() }}/load-records/">
{% trans 'Fichiers envoyes' %} {% trans 'Fichiers envoyes' %}
</a> </a>
</td> </td>