Browse Source

Correction des tests.

bastien 13 years ago
parent
commit
c152f70f52

+ 4 - 4
src/Muzich/CoreBundle/Tests/Searcher/ElementSearcherTest.php View File

71
       ->createQuery("SELECT e
71
       ->createQuery("SELECT e
72
       FROM MuzichCoreBundle:Element e
72
       FROM MuzichCoreBundle:Element e
73
       WHERE e.owner = :suid
73
       WHERE e.owner = :suid
74
-      ORDER BY e.created DESC, e.name DESC")
74
+      ORDER BY e.created DESC, e.id DESC")
75
       ->setParameter('suid', $jean->getId())
75
       ->setParameter('suid', $jean->getId())
76
       ->setMaxResults(20)
76
       ->setMaxResults(20)
77
       ->getResult()
77
       ->getResult()
102
       FROM MuzichCoreBundle:Element e
102
       FROM MuzichCoreBundle:Element e
103
       JOIN e.elements_favorites fav2
103
       JOIN e.elements_favorites fav2
104
       WHERE fav2.user = :fuid
104
       WHERE fav2.user = :fuid
105
-      ORDER BY e.created DESC, e.name DESC")
105
+      ORDER BY e.created DESC, e.id DESC")
106
       ->setParameter('fuid', $paul->getId())
106
       ->setParameter('fuid', $paul->getId())
107
       ->setMaxResults(20)
107
       ->setMaxResults(20)
108
       ->getResult()
108
       ->getResult()
136
       FROM MuzichCoreBundle:Element e 
136
       FROM MuzichCoreBundle:Element e 
137
       LEFT JOIN e.tags t 
137
       LEFT JOIN e.tags t 
138
       WHERE (t.id = :tidHardtek OR t.id = :tidTribe)
138
       WHERE (t.id = :tidHardtek OR t.id = :tidTribe)
139
-      ORDER BY e.created DESC, e.name DESC")
139
+      ORDER BY e.created DESC, e.id DESC")
140
       ->setParameters(array(
140
       ->setParameters(array(
141
         'tidHardtek' => $hardtek->getId(),
141
         'tidHardtek' => $hardtek->getId(),
142
         'tidTribe'   => $tribe->getId()
142
         'tidTribe'   => $tribe->getId()
178
 //      JOIN e.owner eu  LEFT JOIN eu.followers_users f LEFT JOIN g.followers gf
178
 //      JOIN e.owner eu  LEFT JOIN eu.followers_users f LEFT JOIN g.followers gf
179
 //      WHERE (t.id = :tidHardtek OR t.id = :tidTribe)
179
 //      WHERE (t.id = :tidHardtek OR t.id = :tidTribe)
180
 //       AND (f.follower = :userid OR gf.follower = :useridg)
180
 //       AND (f.follower = :userid OR gf.follower = :useridg)
181
-//      ORDER BY e.created DESC, e.name DESC")
181
+//      ORDER BY e.created DESC, e.id DESC")
182
 //      ->setParameters(array(
182
 //      ->setParameters(array(
183
 //        'tidHardtek' => $hardtek->getId(),
183
 //        'tidHardtek' => $hardtek->getId(),
184
 //        'tidTribe'   => $tribe->getId(),
184
 //        'tidTribe'   => $tribe->getId(),

+ 1 - 0
src/Muzich/UserBundle/Controller/UserController.php View File

182
     $form = $this->container->get('fos_user.change_password.form');
182
     $form = $this->container->get('fos_user.change_password.form');
183
     $formHandler = $this->container->get('fos_user.change_password.form.handler');
183
     $formHandler = $this->container->get('fos_user.change_password.form.handler');
184
     
184
     
185
+    $process = $formHandler->process($user);
185
     if (count(($errors = $this->checkChangePasswordInformations($form))) < 1 && $process)
186
     if (count(($errors = $this->checkChangePasswordInformations($form))) < 1 && $process)
186
     {
187
     {
187
       $this->container->get('session')->setFlash('fos_user_success', 'change_password.flash.success');
188
       $this->container->get('session')->setFlash('fos_user_success', 'change_password.flash.success');

+ 1 - 1
src/Muzich/UserBundle/Resources/views/Security/change_password_form.html.twig View File

2
 
2
 
3
 {{ form_errors(form) }}
3
 {{ form_errors(form) }}
4
 
4
 
5
-{% if errors_pers|length > 0 %}
5
+{% if errors_pers is defined %}
6
 <ul class="error_list">
6
 <ul class="error_list">
7
   {% for error in errors_pers %}
7
   {% for error in errors_pers %}
8
     <li>{{ error }}</li>
8
     <li>{{ error }}</li>