add acl for exports

This commit is contained in:
2016-01-26 12:22:22 +01:00
parent 8726f6faee
commit df69448324
4 changed files with 39 additions and 8 deletions

View File

@@ -39,9 +39,10 @@ interface ExportInterface extends ExportElementInterface
*
* @param QueryBuilder $qb
* @param array $requiredModifiers
* @param array $acl an array where each row as a `center` key containing the Chill\MainBundle\Entity\Center, and `circles` containing the reachable circles
* TODO : we should add ability to receive data from a form
*/
public function initiateQuery(QueryBuilder $qb, array $requiredModifiers);
public function initiateQuery(QueryBuilder $qb, array $requiredModifiers, $acl);
public function buildForm(FormBuilderInterface $builder);

View File

@@ -30,6 +30,7 @@ use Doctrine\ORM\QueryBuilder;
use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
use Symfony\Component\Security\Core\Authorization\AuthorizationChecker;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Chill\MainBundle\Form\Type\Export\PickCenterType;
/**
* Collects all agregators, filters and export from
@@ -338,12 +339,14 @@ class ExportManager
* @param mixed[] $data
* @return Response
*/
public function generate($exportAlias, array $data, array $formatterData)
public function generate($exportAlias, array $pickedCentersData, array $data, array $formatterData)
{
$export = $this->getExport($exportAlias);
$qb = $this->em->createQueryBuilder();
$centers = $this->getPickedCenters($pickedCentersData);
$qb = $export->initiateQuery($qb, $this->retrieveUsedModifiers($data));
$qb = $export->initiateQuery($qb, $this->retrieveUsedModifiers($data),
$this->buildCenterReachableScopes($centers, $export));
//handle filters
$this->handleFilters($export, $qb, $data['filters']);
@@ -371,6 +374,26 @@ class ExportManager
$filters, $aggregatorsData);
}
/**
* build the array required for defining centers and circles in the initiate
* queries of ExportElementsInterfaces
*
* @param \Chill\MainBundle\Entity\Center[] $centers
*/
private function buildCenterReachableScopes(array $centers, ExportElementInterface $element) {
$r = array();
foreach($centers as $center) {
$r[] = array(
'center' => $center,
'circles' => $this->authorizationHelper->getReachableScopes($this->user,
$element->requiredRole(), $center)
);
}
return $r;
}
/**
* get the aggregators typse used in the form export data
*
@@ -397,7 +420,7 @@ class ExportManager
public function getPickedCenters(array $data)
{
return $data['c'];
return $data[PickCenterType::CENTERS_IDENTIFIERS];
}
/**