|
@@ -19,10 +19,19 @@ class UserController extends Controller
|
19
|
19
|
$user = $this->getUser();
|
20
|
20
|
|
21
|
21
|
$form_password = $this->container->get('fos_user.change_password.form');
|
|
22
|
+
|
|
23
|
+ $form_tags_favorites = $this->createForm(
|
|
24
|
+ new TagFavoritesForm(),
|
|
25
|
+ array('tags' => $this->getDoctrine()->getRepository('MuzichCoreBundle:User')
|
|
26
|
+ ->getTagIdsFavorites($user->getId())
|
|
27
|
+ ),
|
|
28
|
+ array('tags' => $this->getTagsArray())
|
|
29
|
+ );
|
22
|
30
|
|
23
|
31
|
return array(
|
24
|
32
|
'user' => $user,
|
25
|
|
- 'form_password' => $form_password->createView()
|
|
33
|
+ 'form_password' => $form_password->createView(),
|
|
34
|
+ 'form_tags_favorites' => $form_tags_favorites->createView()
|
26
|
35
|
);
|
27
|
36
|
}
|
28
|
37
|
|
|
@@ -156,7 +165,7 @@ class UserController extends Controller
|
156
|
165
|
}
|
157
|
166
|
else
|
158
|
167
|
{
|
159
|
|
- return $this->redirect($this->generateUrl('home'));
|
|
168
|
+ return $this->redirect($this->generateUrl('my_account'));
|
160
|
169
|
}
|
161
|
170
|
}
|
162
|
171
|
|