Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

add acl for exports

Browse Source
This commit is contained in:
Julien Fastré 2016-01-26 12:22:22 +01:00
parent 8726f6faee
commit df69448324
4 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Controller/ExportController.php
View File

@ -222,7 +222,7 @@ class ExportController extends Controller
'csrf_protection' => $isGenerate ? false : true,
));
if ($step === 'centers') {
if ($step === 'centers' or $step === 'generate_centers') {
$builder->add('centers', PickCenterType::class, array(
'export_alias' => $alias
));
@ -393,7 +393,11 @@ class ExportController extends Controller
{
$exportManager = $this->get('chill.main.export_manager');
$formExport = $this->createCreateFormExport($alias, 'generate_export');
$formCenters = $this->createCreateFormExport($alias, 'generate_centers');
$formCenters->handleRequest($request);
$dataCenters = $formCenters->getData();
$formExport = $this->createCreateFormExport($alias, 'generate_export', $dataCenters);
$formExport->handleRequest($request);
$dataExport = $formExport->getData();
@ -402,6 +406,7 @@ class ExportController extends Controller
$formFormatter->handleRequest($request);
$dataFormatter = $formFormatter->getData();
return $exportManager->generate($alias, $dataExport['export'], $dataFormatter['formatter']);
return $exportManager->generate($alias, $dataCenters['centers'],
$dataExport['export'], $dataFormatter['formatter']);
}
}

3
Export/ExportInterface.php
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);

29
Export/ExportManager.php
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];
}
/**

4
Form/Type/Export/PickCenterType.php
View File

@ -49,6 +49,8 @@ class PickCenterType extends AbstractType
*/
protected $exportManager;
const CENTERS_IDENTIFIERS = 'c';
/**
*
* @var AuthorizationHelper
@ -76,7 +78,7 @@ class PickCenterType extends AbstractType
$centers = $this->authorizationHelper->getReachableCenters($this->user,
$export->requiredRole());
$builder->add('c', EntityType::class, array(
$builder->add(self::CENTERS_IDENTIFIERS, EntityType::class, array(
'class' => 'ChillMainBundle:Center',
'query_builder' => function(EntityRepository $er) use ($centers) {
$qb = $er->createQueryBuilder('c');