Merge remote-tracking branch 'origin/release/3.1'

mapbender · Feb 4, 2020 · 13928f3 · 13928f3
2 parents 2196e1a + a9b2711
commit 13928f3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/FOM/UserBundle/Controller/UserController.php b/src/FOM/UserBundle/Controller/UserController.php
@@ -122,9 +122,6 @@ protected function userActionCommon(Request $request, User $user)
             'acl_permission'   => $this->isGranted('OWNER', $user),
             'currentUser' => $this->getUser(),
         ));
-        if (!$isNew && !$groupPermission) {
-            $form->get('username')->setDisabled(true);
-        }
 
         $form->handleRequest($request);
 

diff --git a/src/FOM/UserBundle/Form/Type/UserType.php b/src/FOM/UserBundle/Form/Type/UserType.php
@@ -6,6 +6,8 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Doctrine\ORM\EntityRepository;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class UserType extends AbstractType
@@ -69,6 +71,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
     }
 
+    public function finishView(FormView $view, FormInterface $form, array $options)
+    {
+        $user = $form->getData();
+        $usernameEnabled = $options['group_permission'] || !$user->getId();
+        $view['username']->vars['disabled'] = !$usernameEnabled;
+    }
+
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(