|
@@ -36,9 +36,10 @@ class DefaultController extends Controller
|
36
|
36
|
$form_new = $this->getGroupForm($new_group);
|
37
|
37
|
|
38
|
38
|
return array(
|
39
|
|
- 'groups' => $user->getGroupsOwned(),
|
40
|
|
- 'form_new' => $form_new->createView(),
|
41
|
|
- 'form_new_name' => $form_new->getName()
|
|
39
|
+ 'groups' => $user->getGroupsOwned(),
|
|
40
|
+ 'form_new' => $form_new->createView(),
|
|
41
|
+ 'form_new_name' => $form_new->getName(),
|
|
42
|
+ 'open_add_group' => false
|
42
|
43
|
);
|
43
|
44
|
}
|
44
|
45
|
|
|
@@ -94,9 +95,10 @@ class DefaultController extends Controller
|
94
|
95
|
return $this->render(
|
95
|
96
|
'MuzichGroupBundle:Default:myList.html.twig',
|
96
|
97
|
array(
|
97
|
|
- 'groups' => $user->getGroupsOwned(),
|
98
|
|
- 'form_new' => $form_new->createView(),
|
99
|
|
- 'form_new_name' => $form_new->getName()
|
|
98
|
+ 'groups' => $user->getGroupsOwned(),
|
|
99
|
+ 'form_new' => $form_new->createView(),
|
|
100
|
+ 'form_new_name' => $form_new->getName(),
|
|
101
|
+ 'open_add_group' => true
|
100
|
102
|
)
|
101
|
103
|
);
|
102
|
104
|
}
|
|
@@ -138,7 +140,7 @@ class DefaultController extends Controller
|
138
|
140
|
$prompt_tags[$tag->getTag()->getId()] = $tag->getTag()->getName();
|
139
|
141
|
}
|
140
|
142
|
|
141
|
|
- $group->setTagsToIds();
|
|
143
|
+ $group->setTags($group->getTagsIdsJson());
|
142
|
144
|
$form = $this->getGroupForm($group);
|
143
|
145
|
|
144
|
146
|
return array(
|
|
@@ -159,9 +161,14 @@ class DefaultController extends Controller
|
159
|
161
|
throw $this->createNotFoundException('Vous n\'ête pas le créateur de ce groupe.');
|
160
|
162
|
}
|
161
|
163
|
|
162
|
|
- // Pour être compatible avec le formulaire, la collection de tags dois être
|
163
|
|
- // une collection d'id
|
164
|
|
- $group->setTagsToIds();
|
|
164
|
+ $prompt_tags = array();
|
|
165
|
+ foreach ($group->getTags() as $tag)
|
|
166
|
+ {
|
|
167
|
+ $prompt_tags[$tag->getTag()->getId()] = $tag->getTag()->getName();
|
|
168
|
+ }
|
|
169
|
+
|
|
170
|
+ // Pour être compatible avec le formulaire
|
|
171
|
+ $group->setTags($group->getTagsIdsJson());
|
165
|
172
|
$form = $this->getGroupForm($group);
|
166
|
173
|
|
167
|
174
|
$form->bindRequest($request);
|
|
@@ -178,14 +185,14 @@ class DefaultController extends Controller
|
178
|
185
|
return $this->redirect($this->generateUrl('show_group', array('slug' => $group->getSlug())));
|
179
|
186
|
}
|
180
|
187
|
else
|
181
|
|
- {
|
182
|
|
- $this->setFlash('error', 'group.update.failure');
|
183
|
|
-
|
|
188
|
+ {
|
184
|
189
|
return $this->render(
|
185
|
|
- 'GroupBundle:Default:edit.html.twig',
|
|
190
|
+ 'MuzichGroupBundle:Default:edit.html.twig',
|
186
|
191
|
array(
|
187
|
|
- 'form_new' => $form->createView(),
|
188
|
|
- 'form_new_name' => $form_new->getName()
|
|
192
|
+ 'group' => $group,
|
|
193
|
+ 'form' => $form->createView(),
|
|
194
|
+ 'form_name' => 'group',
|
|
195
|
+ 'search_tags' => $prompt_tags
|
189
|
196
|
)
|
190
|
197
|
);
|
191
|
198
|
}
|