bug fix: Il n'atait pas effectué de test de dulicité sur l'email lors de l'insciption ... :/

app/Resources/translations/validators.en.yml

@@ -35,6 +35,9 @@ error:
       tolong:            The name is too long.|The name is too long.
   url:
     invalid:             The URL is not a valid one.
+  registration:
+    email:
+      duplicate:         Email address is already in use on muzi.ch
   
       
 registration:

app/Resources/translations/validators.fr.yml

@@ -35,6 +35,9 @@ error:
       tolong:            Le nom est trop long
   url:
     invalid:             L'adresse fournie est invalide
+  registration:
+    email:
+      duplicate:         L'adresse email est déjà utilisé sur muzi.ch
   
       
 registration:

src/Muzich/CoreBundle/Entity/User.php

@@ -259,6 +259,12 @@ class User extends BaseUser
   public $mail_partner = true;
   
   /**
+   * @ORM\Column(type="boolean", nullable=true)
+   * @var type boolean
+   */
+  private $username_updatable = false;
+  
+  /**
    * 
    */
   public function __construct()
@@ -1098,4 +1104,19 @@ class User extends BaseUser
     ;
   }
   
+  public function setUsernameUpdatable($updatable)
+  {
+    if ($updatable)
+      $this->username_updatable = true;
+    else
+      $this->username_updatable = false;
+  }
+  
+  public function isUsernameUpdateable()
+  {
+    if ($this->username_updatable)
+      return true;
+    return false;
+  }
+  
 }

src/Muzich/UserBundle/Controller/UserController.php

@@ -137,8 +137,9 @@ class UserController extends Controller
     $user = $this->getNewUser($userManager);
     $form = $this->getRegistrationForm($user);
     $form->bindRequest($request);
+    $errors = $this->checkRegistrationValues($form);
     
-    if ($form->isValid())
+    if ($form->isValid() && !count($errors))
     {
       $response = $this->getSuccessRegistrationResponse();
       $userManager->updateUser($user);
@@ -146,7 +147,7 @@ class UserController extends Controller
       return $response;
     }
     
-    return $this->getFailureRegistrationResponse($form);
+    return $this->getFailureRegistrationResponse($form, $errors);
   }
   
   protected function getRegistrationForm(User $user)
@@ -163,6 +164,7 @@ class UserController extends Controller
     $user->setPlainPassword($this->generatePassword(32));
     $user->setEnabled(true);
     $user->setCguAccepted(true);
+    $user->setUsernameUpdatable(true);
     return $user;
   }
   
@@ -188,6 +190,22 @@ class UserController extends Controller
     return $result;
   }
   
+  protected function checkRegistrationValues($form)
+  {
+    $count = $this->getEntityManager()->createQuery("SELECT count(u.id) "
+      ."FROM MuzichCoreBundle:User u "
+      ."WHERE UPPER(u.email) = :email_canonical")
+      ->setParameter('email_canonical', strtoupper($form->getData()->getEmailCanonical()))
+      ->getSingleScalarResult()
+    ;
+    
+    if ($count)
+    {
+      return array($this->trans('error.registration.email.duplicate', array(), 'validators'));
+    }
+    return array();
+  }
+  
   protected function getSuccessRegistrationResponse()
   {
     if (!$this->getRequest()->isXmlHttpRequest())
@@ -201,13 +219,13 @@ class UserController extends Controller
     ));
   }
   
-  protected function getFailureRegistrationResponse($form)//, $formHandler)
+  protected function getFailureRegistrationResponse($form, $errors = array())//, $formHandler)
   {
     $parameters = array(
       'form'                     => $form->createView(),
       'error'                    => null,
       'registration_errors'      => $form->getErrors(),
-      //'registration_errors_pers' => $formHandler->getErrors(),
+      'registration_errors_pers' => $errors,
       'last_username'            => null,
       'registration_page'        => true,
       'presubscription_form'     => $this->getPreSubscriptionForm()->createView()

src/Muzich/UserBundle/Form/Type/RegistrationFormType.php

@@ -10,18 +10,15 @@ class RegistrationFormType  extends AbstractType
 {
   public function buildForm(FormBuilderInterface $builder, array $options)
   {
-    $builder->add('email', 'email', array(
-      'label' => 'form.email',
-      'translation_domain' => 'FOSUserBundle'
-    ));
+    $builder->add('email', 'email');
   }
   
-  //public function setDefaultOptions(OptionsResolverInterface $resolver)
-  //{
-  //  $resolver->setDefaults(array(
-  //    'data_class' => 'Muzich\CoreBundle\Entity\User'
-  //  ));
-  //}
+  public function setDefaultOptions(OptionsResolverInterface $resolver)
+  {
+    $resolver->setDefaults(array(
+      'data_class' => 'Muzich\CoreBundle\Entity\User'
+    ));
+  }
   
   public function getName()
   {

src/Muzich/UserBundle/Resources/views/Info/bar.html.twig

@@ -15,7 +15,9 @@
 <ul class="user_events_infos">
 
   <li class="user_name">
-    {{ app.user.name }}
+    <a href="{{ path('my_account') }}">
+      {{ app.user.name }}
+    </a>
   </li>
 
   <li class="user_messages">