Browse Source

Correction des tests.

bastien 12 years ago
parent
commit
c152f70f52

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

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

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

@@ -182,6 +182,7 @@ class UserController extends Controller
182 182
     $form = $this->container->get('fos_user.change_password.form');
183 183
     $formHandler = $this->container->get('fos_user.change_password.form.handler');
184 184
     
185
+    $process = $formHandler->process($user);
185 186
     if (count(($errors = $this->checkChangePasswordInformations($form))) < 1 && $process)
186 187
     {
187 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,7 +2,7 @@
2 2
 
3 3
 {{ form_errors(form) }}
4 4
 
5
-{% if errors_pers|length > 0 %}
5
+{% if errors_pers is defined %}
6 6
 <ul class="error_list">
7 7
   {% for error in errors_pers %}
8 8
     <li>{{ error }}</li>