Merge branch 'feature/group' into unstable

app/Resources/translations/elements.fr.yml

@@ -4,4 +4,7 @@ noelements:
   
 element:
   favorite:
-    add:                Ajouter a mes favoris
+    add:                Ajouter a mes favoris
+  add:
+    group:
+      will_be_in:       L'élément sera ajouté dans le groupe

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -116,8 +116,8 @@ class CoreController extends Controller
   /**
    *  Procédure d'ajout d'un element
    */
-  public function elementAddAction()
-  {
+  public function elementAddAction($group_slug)
+  {    
     $user = $this->getUser();
     $em = $this->getDoctrine()->getEntityManager();
     
@@ -126,6 +126,7 @@ class CoreController extends Controller
       array(),
       array(
        'tags'   => $this->getTagsArray(),
+        // Ligne non obligatoire (cf. verif du contenu du form -> ticket)
        'groups' => $this->getGroupsArray()
       )
     );
@@ -142,16 +143,35 @@ class CoreController extends Controller
         $factory = new ElementManager($element, $em, $this->container);
         $factory->proceedFill($data, $user);
         
+        // Si on a précisé un groupe
+        if ($group_slug)
+        {
+          $group = $this->findGroupWithSlug($group_slug);
+          if ($group->userCanAddElement($this->getUserId()))
+          {
+            $element->setGroup($group);
+          }
+          else
+          {
+            throw $this->createNotFoundException('Vous ne pouvez ajouter d\'element a ce groupe.');
+          }
+          $redirect_url = $this->generateUrl('show_group', array('slug' => $group->getSlug()));
+        }
+        else
+        {
+          $redirect_url = $this->generateUrl('home');
+        }
+        
         $em->persist($element);
         $em->flush();
         
         if ($this->getRequest()->isXmlHttpRequest())
         {
-
+          
         }
         else
         {
-          return $this->redirect($this->generateUrl('home'));
+          return $this->redirect($redirect_url);
         }
         
       }
@@ -164,7 +184,7 @@ class CoreController extends Controller
         else
         {
           $this->setFlash('error', 'element.add.error');
-          return $this->redirect($this->generateUrl('home'));
+          return $this->redirect($redirect_url);
         }
         
       }

src/Muzich/CoreBundle/ElementFactory/ElementManager.php

@@ -83,9 +83,9 @@ class ElementManager
   
   protected function setGroup($params)
   {
-    if ($params['group_id'])
+    if ($params['group'])
     {
-      $group = $this->em->getRepository('MuzichCoreBundle:Group')->findOneById($params['group_id']);
+      $group = $this->em->getRepository('MuzichCoreBundle:Group')->findOneById($params['group']);
       $this->element->setGroup($group);
     }
   }

src/Muzich/CoreBundle/Entity/Element.php

@@ -210,6 +210,10 @@ class Element
     return $this->tags;
   }
   
+  public function setTags($tags)
+  {
+    $this->tags = $tags;
+  }
 
   /**
    * Set owner
@@ -352,4 +356,9 @@ class Element
     return count($this->elements_favorites);
   }
   
+  public function setGroupToId()
+  {
+    $this->group = $this->group->getId();
+  }
+  
 }

src/Muzich/CoreBundle/Entity/Group.php

@@ -321,4 +321,24 @@ class Group
     $this->tags = $tags_id;
   }
   
+  /**
+   * Retourne vrai si l'user_id peut poster dans ce groupe.
+   * 
+   * @param int $user_id
+   * @return boolean 
+   */
+  public function userCanAddElement($user_id)
+  {
+    if ($this->open)
+    {
+      return true;
+    }
+    
+    if ($this->getOwner()->getId() == $user_id)
+    {
+      return true;
+    }
+    
+    return false;
+  }
 }

src/Muzich/CoreBundle/Entity/User.php

@@ -260,6 +260,21 @@ class User extends BaseUser
   {
     return $this->groups_owned;
   }
+
+  /**
+   * Get groups in array (id => name)
+   *
+   * @return Doctrine\Common\Collections\Collection 
+   */
+  public function getGroupsOwnedArray()
+  {
+    $groups = array();
+    foreach ($this->groups_owned as $group)
+    {
+      $groups[$group->getId()] = $group->getName();
+    }
+    return $groups;
+  }
   
   public function getSlug()
   {

src/Muzich/CoreBundle/Form/Element/ElementAddForm.php

@@ -22,14 +22,15 @@ class ElementAddForm extends AbstractType
       'expanded'          => true,
       'multiple'          => true
     ));
-        
-    $options['groups'][''] = '';
     
-    $builder->add('group_id', 'choice', array(
+    $options['groups'][''] = '';
+    $builder->add('group', 'choice', array(
       'choices'           => $options['groups'],
       'expanded'          => false,
-      'multiple'          => false
+      'multiple'          => false,
+      'required'          => false
     ));
+    
   }
 
   public function getName()
@@ -43,7 +44,7 @@ class ElementAddForm extends AbstractType
       'name' => '',
       'url' => '',
       'tags' => array(),
-      'groups' => '',
+      'groups' => array(),
       'data_class' => 'Muzich\CoreBundle\Entity\Element'
     );
   }

src/Muzich/CoreBundle/Resources/config/routing.yml

@@ -9,5 +9,5 @@ follow:
   defaults: { _controller: MuzichCoreBundle:Core:follow }
    
 element_add:
-  pattern:  /element/add
-  defaults: { _controller: MuzichCoreBundle:Core:elementAdd }
+  pattern:  /element/add/{group_slug}
+  defaults: { _controller: MuzichCoreBundle:Core:elementAdd, group_slug: null }

src/Muzich/CoreBundle/Resources/views/Element/form.add.html.twig

@@ -6,6 +6,6 @@
 
 {{ form_row(form.tags) }}
 
-{{ form_row(form.group_id) }}
+{{ form_row(form.group) }}
 
 {{ form_rest(form) }}

src/Muzich/HomeBundle/Controller/HomeController.php

@@ -21,6 +21,9 @@ class HomeController extends Controller
   public function indexAction()
   {
     $search_object = $this->getElementSearcher();
+    $user = $this->getUser(true, array('join' => array(
+      'groups_owned'
+    )), true);
     
     $search_form = $this->createForm(
       new ElementSearchForm(), 
@@ -35,7 +38,7 @@ class HomeController extends Controller
       array(),
       array(
         'tags' => $tags,
-        'groups' => $this->getGroupsArray(),
+        'groups' => $user->getGroupsOwnedArray(),
       )
     );
         

src/Muzich/HomeBundle/Controller/ShowController.php

@@ -4,6 +4,8 @@ namespace Muzich\HomeBundle\Controller;
 
 use Muzich\CoreBundle\lib\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use Muzich\CoreBundle\Form\Element\ElementAddForm;
+use Muzich\CoreBundle\Entity\Element;
 
 class ShowController extends Controller
 {
@@ -44,12 +46,25 @@ class ShowController extends Controller
       'group_id'  => $group->getId()
     ));
     
+    ($group->getOwner()->getId() == $this->getUserId()) ? $his = true : $his = false;
+    if ($his || $group->getOpen())
+    {      
+      $add_form = $this->createForm(
+        new ElementAddForm(),
+        array(),
+        array(
+          'tags' => $this->getTagsArray()
+        )
+      );
+    }
+    
     return array(
       'group'     => $group,
       'his_group' => ($group->getOwner()->getId() == $this->getUserId()) ? true : false,
       'elements'  => $search_object->getElements($this->getDoctrine(), $this->getUserId()),
       'following' => $this->getUser()->isFollowingGroupByQuery($this->getDoctrine(), $group->getId()),
-      'user'      => $this->getUser()
+      'user'      => $this->getUser(),
+      'add_form'  => (isset($add_form)) ? $add_form->createView() : null
     );
   }
   

src/Muzich/HomeBundle/Resources/views/Show/showGroup.html.twig

@@ -24,6 +24,18 @@
     
   <h2>{{ group.name }}</h2>
   
+  <form action="{{ path('element_add', {'group_slug' : group.slug}) }}" method="post" {{ form_enctype(add_form) }}>
+    
+    {% include "MuzichCoreBundle:Element:form.add.html.twig" with { 'form': add_form } %}
+
+    <p>
+      <i>
+        {{ 'element.add.group.will_be_in'|trans({}, 'elements') }}
+      </i>
+    </p>
+    <input type="submit" />
+  </form>
+  
   {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
     
 {% endblock %}