Merge branch 'master' into privacyEvent

This commit is contained in:
Mat
2018-10-19 13:39:21 +02:00
9 changed files with 106 additions and 13 deletions

View File

@@ -26,6 +26,7 @@ use Chill\TaskBundle\Event\TaskEvent;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\Translation\TranslatorInterface;
use Chill\TaskBundle\Event\UI\UIEvent;
use Chill\MainBundle\Repository\CenterRepository;
class SingleTaskController extends Controller
@@ -382,6 +383,7 @@ class SingleTaskController extends Controller
PaginatorFactory $paginatorFactory,
SingleTaskRepository $taskRepository,
PersonRepository $personRepository,
CenterRepository $centerRepository,
FormFactoryInterface $formFactory
) {
/* @var $viewParams array The parameters for the view */
@@ -392,7 +394,6 @@ class SingleTaskController extends Controller
$viewParams['user'] = null;
$params['user'] = null;
$viewParams['center'] = null;
$params['center'] = null;
$params['types'] = null;
// Get parameters from url
@@ -408,6 +409,14 @@ class SingleTaskController extends Controller
$viewParams['person'] = $person;
$params['person'] = $person;
} elseif (!empty($request->query->get('center_id', NULL))) {
$center = $centerRepository->find($request->query->getInt('center_id'));
dump($center);
if ($center === null) {
throw $this->createNotFoundException('center not found');
}
$params['center'] = $center;
}
if(!empty($request->query->get('types', []))) {