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

PHRAS-1304_AUTO-COMPLETION_MASTER (#2061)

Browse Source 
* PHRAS-1304_AUTO-COMPLETION_MASTER
ported from 4.0

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 (5.5.21 is obsolete in cicleci)

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 : php.ini moved in circelci

* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq & date to php for circleci

* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump amqp

* PHRAS-1304_AUTO-COMPLETION_MASTER
downgrade amqp to 1.2 to test compilation against old librabbit 0.4 (ubuntu)

* PHRAS-1304_AUTO-COMPLETION_MASTER
add amqp.so to php.ini, (re)bump amqp to 1.6

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again and again

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix test on media rotation 600*400 -> 400*599 !!!

* PHRAS-1304_AUTO-COMPLETION_MASTER
restore facebook sdk to 4.0.1 due to mistake

* PHRAS-1304_AUTO-COMPLETION_MASTER
deleted unwanted file
This commit is contained in:
jygaulier
2017-02-06 18:26:56 +01:00
committed by GitHub
parent cefb2f99f4
commit a70bf2fc70
69 changed files with 1032 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/Alchemy/Tests/Phrasea/Controller/Prod/QueryTest.php
View File

@@ -48,7 +48,8 @@ class QueryTest extends \PhraseanetAuthenticatedWebTestCase
$this->authenticate($app);
$options = new SearchEngineOptions();
$options->onCollections($app->getAclForUser($app->getAuthenticatedUser())->get_granted_base());
$searchableBasesIds = $app->getAclForUser($app->getAuthenticatedUser())->getSearchableBasesIds();
$options->onBasesIds($searchableBasesIds);
$serializedOptions = $options->serialize();
$response = $this->request('POST', '/prod/query/answer-train/', [

3
tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php
View File

@@ -103,7 +103,8 @@ class RecordsTest extends \PhraseanetAuthenticatedWebTestCase
$options = new SearchEngineOptions();
$acl = $app->getAclForUser($app->getAuthenticatedUser());
$options->onCollections($acl->get_granted_base());
$searchableBasesIds = $acl->getSearchableBasesIds();
$options->onBasesIds($searchableBasesIds);
$serializedOptions = $options->serialize();
$response = $this->XMLHTTPRequest('POST', '/prod/records/', [