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

Fix PHRAS-146 Order of a basket generates an error when the content comes from two different collections

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-05-30 17:32:24 +02:00
parent e5b8817c46
commit d42f27ad40
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Alchemy/Phrasea/Controller/Prod/Order.php
View File

@@ -155,9 +155,10 @@ class Order implements ControllerProviderInterface
try {
$records = RecordsRequest::fromRequest($app, $request, true, array('cancmd'));
$query = new \User_Query($app);
foreach ($records as $key => $record) {
$query = new \User_Query($app);
if ($collectionHasOrderAdmins->containsKey($record->get_base_id())) {
if (!$collectionHasOrderAdmins->get($record->get_base_id())) {
$records->remove($key);
@@ -182,8 +183,8 @@ class Order implements ControllerProviderInterface
}
$noAdmins = $collectionHasOrderAdmins->forAll(function ($key, $hasAdmin) {
return false === $hasAdmin;
});
return false === $hasAdmin;
});
if ($noAdmins) {
$msg = _('There is no one to validate orders, please contact an administrator');