mirror of
				https://gitlab.com/Chill-Projet/chill-bundles.git
				synced 2025-11-04 03:08:25 +00:00 
			
		
		
		
	Use injected EntityManager - fix property visibility.
This commit is contained in:
		@@ -49,13 +49,11 @@ use Doctrine\ORM\EntityManagerInterface;
 | 
			
		||||
class PersonController extends AbstractController
 | 
			
		||||
{
 | 
			
		||||
    /**
 | 
			
		||||
     *
 | 
			
		||||
     * @var SimilarPersonMatcher
 | 
			
		||||
     */
 | 
			
		||||
    protected $similarPersonMatcher;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     *
 | 
			
		||||
     * @var TranslatorInterface
 | 
			
		||||
     */
 | 
			
		||||
    protected $translator;
 | 
			
		||||
@@ -66,34 +64,31 @@ class PersonController extends AbstractController
 | 
			
		||||
    protected $eventDispatcher;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     *
 | 
			
		||||
     * @var PersonRepository;
 | 
			
		||||
     */
 | 
			
		||||
    protected $personRepository;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     *
 | 
			
		||||
     * @var ConfigPersonAltNamesHelper
 | 
			
		||||
     */
 | 
			
		||||
    protected $configPersonAltNameHelper;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     *
 | 
			
		||||
     * @var EntityManagerInterface
 | 
			
		||||
     */
 | 
			
		||||
    protected $em;
 | 
			
		||||
    private $em;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @var \Psr\Log\LoggerInterface
 | 
			
		||||
     */
 | 
			
		||||
    private $logger;
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @var ValidatorInterface
 | 
			
		||||
     */
 | 
			
		||||
    private $validator;
 | 
			
		||||
 | 
			
		||||
  public function __construct(
 | 
			
		||||
    public function __construct(
 | 
			
		||||
        SimilarPersonMatcher $similarPersonMatcher,
 | 
			
		||||
        TranslatorInterface $translator,
 | 
			
		||||
        EventDispatcherInterface $eventDispatcher,
 | 
			
		||||
@@ -117,8 +112,7 @@ class PersonController extends AbstractController
 | 
			
		||||
    {
 | 
			
		||||
        $cFGroup = null;
 | 
			
		||||
 | 
			
		||||
        $em  = $this->getDoctrine()->getManager();
 | 
			
		||||
        $cFDefaultGroup  = $em->getRepository("ChillCustomFieldsBundle:CustomFieldsDefaultGroup")
 | 
			
		||||
        $cFDefaultGroup  = $this->em->getRepository("ChillCustomFieldsBundle:CustomFieldsDefaultGroup")
 | 
			
		||||
            ->findOneByEntity("Chill\PersonBundle\Entity\Person");
 | 
			
		||||
 | 
			
		||||
        if($cFDefaultGroup) {
 | 
			
		||||
@@ -207,8 +201,7 @@ class PersonController extends AbstractController
 | 
			
		||||
                            ->trans('The person data has been updated')
 | 
			
		||||
                            );
 | 
			
		||||
 | 
			
		||||
            $em = $this->getDoctrine()->getManager();
 | 
			
		||||
            $em->flush();
 | 
			
		||||
            $this->em->flush();
 | 
			
		||||
 | 
			
		||||
            $url = $this->generateUrl('chill_person_view', array(
 | 
			
		||||
                'person_id' => $person->getId()
 | 
			
		||||
@@ -402,11 +395,9 @@ class PersonController extends AbstractController
 | 
			
		||||
                'You are not allowed to create this person');
 | 
			
		||||
 | 
			
		||||
        if ($errors->count() ===  0) {
 | 
			
		||||
            $em = $this->getDoctrine()->getManager();
 | 
			
		||||
            $this->em->persist($person);
 | 
			
		||||
 | 
			
		||||
            $em->persist($person);
 | 
			
		||||
 | 
			
		||||
            $em->flush();
 | 
			
		||||
            $this->em->flush();
 | 
			
		||||
 | 
			
		||||
            return $this->redirect($this->generateUrl('chill_person_general_edit',
 | 
			
		||||
                    array('person_id' => $person->getId())));
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user