Fix order

This commit is contained in:
Romain Neutron
2013-08-27 12:17:20 +02:00
parent 93c41f1129
commit ae28828f10

View File

@@ -158,7 +158,7 @@ class Order implements ControllerProviderInterface
$toRemove = array(); $toRemove = array();
$records = RecordsRequest::fromRequest($app, $request, true, array('cancmd')); $records = RecordsRequest::fromRequest($app, $request, true, array('cancmd'));
$query = new \User_Query($app); $hasOneAdmin = array();
if (!$records->isEmpty()) { if (!$records->isEmpty()) {
$order = new OrderEntity(); $order = new OrderEntity();
@@ -172,13 +172,16 @@ class Order implements ControllerProviderInterface
} }
} }
$hasOneAdmin = !!count($query->on_base_ids(array($record->get_base_id())) if (!isset($hasOneAdmin[$record->get_base_id()])) {
->who_have_right(array('order_master')) $query = new \User_Query($app);
->execute()->get_results()); $hasOneAdmin[$record->get_base_id()] = (Boolean) count($query->on_base_ids(array($record->get_base_id()))
->who_have_right(array('order_master'))
->execute()->get_results());
}
$collectionHasOrderAdmins->set($record->get_base_id(), $hasOneAdmin); $collectionHasOrderAdmins->set($record->get_base_id(), $hasOneAdmin[$record->get_base_id()]);
if (!$hasOneAdmin) { if (!$hasOneAdmin[$record->get_base_id()]) {
$toRemove[] = $key; $toRemove[] = $key;
} else { } else {
$orderElement = new OrderElement(); $orderElement = new OrderElement();