|
@@ -14,6 +14,8 @@ use Symfony\Component\Validator\Constraints\Collection;
|
14
|
14
|
class UserController extends Controller
|
15
|
15
|
{
|
16
|
16
|
|
|
17
|
+ protected $tags_favorites = array();
|
|
18
|
+
|
17
|
19
|
protected function getChangeEmailForm()
|
18
|
20
|
{
|
19
|
21
|
$collectionConstraint = new Collection(array(
|
|
@@ -32,7 +34,7 @@ class UserController extends Controller
|
32
|
34
|
{
|
33
|
35
|
return $this->createForm(
|
34
|
36
|
new TagFavoritesForm(),
|
35
|
|
- array('tags' => $this->getDoctrine()->getRepository('MuzichCoreBundle:User')
|
|
37
|
+ array('tags' => $this->tags_favorites = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')
|
36
|
38
|
->getTagIdsFavorites($user->getId())
|
37
|
39
|
),
|
38
|
40
|
array('tags' => $this->getTagsArray())
|
|
@@ -52,10 +54,13 @@ class UserController extends Controller
|
52
|
54
|
$change_email_form = $this->getChangeEmailForm();
|
53
|
55
|
|
54
|
56
|
return array(
|
55
|
|
- 'user' => $user,
|
56
|
|
- 'form_password' => $form_password->createView(),
|
57
|
|
- 'form_tags_favorites' => $form_tags_favorites->createView(),
|
58
|
|
- 'change_email_form' => $change_email_form->createView()
|
|
57
|
+ 'tags' => $this->getTagsArray(),
|
|
58
|
+ 'user' => $user,
|
|
59
|
+ 'form_password' => $form_password->createView(),
|
|
60
|
+ 'form_tags_favorites' => $form_tags_favorites->createView(),
|
|
61
|
+ 'form_tags_favorites_name' => $form_tags_favorites->getName(),
|
|
62
|
+ 'favorite_tags_id' => $this->tags_favorites,
|
|
63
|
+ 'change_email_form' => $change_email_form->createView()
|
59
|
64
|
);
|
60
|
65
|
}
|
61
|
66
|
|
|
@@ -212,21 +217,20 @@ class UserController extends Controller
|
212
|
217
|
}
|
213
|
218
|
else
|
214
|
219
|
{
|
215
|
|
- $form_tags_favorites = $this->createForm(
|
216
|
|
- new TagFavoritesForm(),
|
217
|
|
- array('tags' => $this->getDoctrine()->getRepository('MuzichCoreBundle:User')
|
218
|
|
- ->getTagIdsFavorites($user->getId())
|
219
|
|
- ),
|
220
|
|
- array('tags' => $this->getTagsArray())
|
221
|
|
- );
|
|
220
|
+ $form_tags_favorites = $this->getTagsFavoritesForm($user);
|
|
221
|
+ $change_email_form = $this->getChangeEmailForm();
|
222
|
222
|
|
223
|
223
|
return $this->container->get('templating')->renderResponse(
|
224
|
224
|
'MuzichUserBundle:User:account.html.twig',
|
225
|
225
|
array(
|
226
|
|
- 'form_password' => $form->createView(),
|
227
|
|
- 'errors_pers' => $errors,
|
228
|
|
- 'user' => $user,
|
229
|
|
- 'form_tags_favorites' => $form_tags_favorites->createView()
|
|
226
|
+ 'tags' => $this->getTagsArray(),
|
|
227
|
+ 'form_password' => $form->createView(),
|
|
228
|
+ 'errors_pers' => $errors,
|
|
229
|
+ 'user' => $user,
|
|
230
|
+ 'form_tags_favorites' => $form_tags_favorites->createView(),
|
|
231
|
+ 'form_tags_favorites_name' => $form_tags_favorites->getName(),
|
|
232
|
+ 'favorite_tags_id' => $this->tags_favorites,
|
|
233
|
+ 'change_email_form' => $change_email_form->createView()
|
230
|
234
|
)
|
231
|
235
|
);
|
232
|
236
|
}
|
|
@@ -243,17 +247,13 @@ class UserController extends Controller
|
243
|
247
|
public function startAction()
|
244
|
248
|
{
|
245
|
249
|
$user = $this->getUser();
|
246
|
|
-
|
247
|
|
- $form = $this->createForm(
|
248
|
|
- new TagFavoritesForm(),
|
249
|
|
- array('tags' => $this->getDoctrine()->getRepository('MuzichCoreBundle:User')
|
250
|
|
- ->getTagIdsFavorites($user->getId())
|
251
|
|
- ),
|
252
|
|
- array('tags' => $this->getTagsArray())
|
253
|
|
- );
|
|
250
|
+ $form_tags_favorites = $this->getTagsFavoritesForm($user);
|
254
|
251
|
|
255
|
252
|
return array(
|
256
|
|
- 'form' => $form->createView()
|
|
253
|
+ 'tags' => $this->getTagsArray(),
|
|
254
|
+ 'favorite_tags_id' => $this->tags_favorites,
|
|
255
|
+ 'form_tags_favorites' => $form_tags_favorites->createView(),
|
|
256
|
+ 'form_tags_favorites_name' => $form_tags_favorites->getName(),
|
257
|
257
|
);
|
258
|
258
|
}
|
259
|
259
|
|
|
@@ -411,10 +411,13 @@ class UserController extends Controller
|
411
|
411
|
return $this->container->get('templating')->renderResponse(
|
412
|
412
|
'MuzichUserBundle:User:account.html.twig',
|
413
|
413
|
array(
|
414
|
|
- 'user' => $user,
|
415
|
|
- 'form_password' => $form_password->createView(),
|
416
|
|
- 'form_tags_favorites' => $form_tags_favorites->createView(),
|
417
|
|
- 'change_email_form' => $change_email_form->createView()
|
|
414
|
+ 'tags' => $this->getTagsArray(),
|
|
415
|
+ 'user' => $user,
|
|
416
|
+ 'form_password' => $form_password->createView(),
|
|
417
|
+ 'form_tags_favorites' => $form_tags_favorites->createView(),
|
|
418
|
+ 'form_tags_favorites_name' => $form_tags_favorites->getName(),
|
|
419
|
+ 'favorite_tags_id' => $this->tags_favorites,
|
|
420
|
+ 'change_email_form' => $change_email_form->createView()
|
418
|
421
|
)
|
419
|
422
|
);
|
420
|
423
|
}
|