fix errors to user picker: add placeholder and allow empty

This commit is contained in:
Julien Fastré 2018-05-08 22:56:03 +02:00
parent d684851f36
commit 6f73c9ee09
2 changed files with 5 additions and 1 deletions

View File

@ -83,7 +83,7 @@ class UserPickerType extends AbstractType
$resolver $resolver
->setDefault('class', User::class) ->setDefault('class', User::class)
->setDefault('empty_data', $this->tokenStorage->getToken()->getUser()) ->setDefault('placeholder', 'Choose an user')
->setDefault('choice_label', function(User $u) { ->setDefault('choice_label', function(User $u) {
return $u->getUsername(); return $u->getUsername();
}) })

View File

@ -50,6 +50,10 @@ class UserCircleConsistencyValidator extends ConstraintValidator
/* @var $user \Chill\MainBundle\Entity\User */ /* @var $user \Chill\MainBundle\Entity\User */
$user = \call_user_func([$value, $constraint->getUserFunction ]); $user = \call_user_func([$value, $constraint->getUserFunction ]);
if ($user === null) {
return;
}
if (FALSE === $this->autorizationHelper->userHasAccess($user, $value, $constraint->role)) { if (FALSE === $this->autorizationHelper->userHasAccess($user, $value, $constraint->role)) {
$this->context $this->context
->buildViolation($constraint->message) ->buildViolation($constraint->message)