Merge branch 'feature/viewprofile' into unstable

src/Muzich/CoreBundle/Entity/Group.php

@@ -129,6 +129,26 @@ class Group
   }
 
   /**
+   * Set slug
+   *
+   * @param string $slug
+   */
+  public function setSlug($slug)
+  {
+    $this->slug = $slug;
+  }
+
+  /**
+   * Get slug
+   *
+   * @return string 
+   */
+  public function getSlug()
+  {
+    return $this->slug;
+  }
+
+  /**
    * Set description
    *
    * @param string $description

src/Muzich/CoreBundle/Entity/User.php

@@ -267,5 +267,9 @@ class User extends BaseUser
    * 
    */
   
+  public function getName()
+  {
+    return $this->getUsername();
+  }
   
 }

src/Muzich/CoreBundle/Repository/ElementRepository.php

@@ -64,7 +64,7 @@ class ElementRepository extends EntityRepository
       FROM MuzichCoreBundle:Element e 
       LEFT JOIN e.group g JOIN e.type et JOIN e.tags t $query_with 
         JOIN e.owner eu $join_personal
-      ORDER BY e.date_added DESC "
+      ORDER BY e.created DESC "
     ;
     
     $query = $this->getEntityManager()
@@ -76,4 +76,52 @@ class ElementRepository extends EntityRepository
     return $query;
   }
   
+  /**
+   * Retourne une requete selectionnant les Elements en fonction du
+   * propriétaire.
+   * 
+   * @param int $user_id
+   * @param int $limit
+   * @return type Doctrine\ORM\Query
+   */
+  public function findByUser($user_id, $limit)
+  {
+    return $this->getEntityManager()
+      ->createQuery('
+        SELECT e, u, g, t FROM MuzichCoreBundle:Element e
+        JOIN e.owner u
+        JOIN e.group g
+        JOIN e.tags t
+        WHERE u.id = :uid
+        ORDER BY e.created DESC'
+      )
+      ->setParameter('uid', $user_id)
+      ->setMaxResults($limit)
+    ;
+  }
+  
+  /**
+   * Retourne une requete selectionnant les Elements en fonction du
+   * groupe.
+   * 
+   * @param int $user_id
+   * @param int $limit
+   * @return type Doctrine\ORM\Query
+   */
+  public function findByGroup($group_id, $limit)
+  {
+    return $this->getEntityManager()
+      ->createQuery('
+        SELECT e, u, g, t FROM MuzichCoreBundle:Element e
+        JOIN e.owner u
+        JOIN e.group g
+        JOIN e.tags t
+        WHERE g.id = :gid
+        ORDER BY e.created DESC'
+      )
+      ->setParameter('gid', $group_id)
+      ->setMaxResults($limit)
+    ;
+  }
+  
 }

src/Muzich/CoreBundle/Repository/GroupRepository.php

@@ -28,5 +28,24 @@ class GroupRepository extends EntityRepository
     ;
   }
   
+  /**
+   * Retourne une Query sleectionnant un Group par son slug
+   * 
+   * @param type string 
+   * @return Doctrine\ORM\Query
+   */
+  public function findOneBySlug($slug)
+  {
+    return $this->getEntityManager()
+      ->createQuery("
+        SELECT g FROM MuzichCoreBundle:Group g
+        WHERE g.slug = :str
+      ")
+      ->setParameters(array(
+        'str' => $slug
+      ))
+    ;
+  }
+  
 }
   

src/Muzich/CoreBundle/Repository/UserRepository.php

@@ -75,7 +75,8 @@ class UserRepository extends EntityRepository
   }
   
   /**
-   * Retourne un tableau d'user correspondant a un chaine de caractère
+   * Retourne la requete selectionnant les user correspondant a une 
+   * chaine de caractère
    * La recherche est effectué sur le username.
    * 
    * @param type $string
@@ -96,5 +97,24 @@ class UserRepository extends EntityRepository
     ;
   }
   
+  /**
+   * Retourne une Query sleectionnant un User par son slug
+   * 
+   * @param type string 
+   * @return Doctrine\ORM\Query
+   */
+  public function findOneBySlug($slug)
+  {
+    return $this->getEntityManager()
+      ->createQuery("
+        SELECT u FROM MuzichCoreBundle:User u
+        WHERE u.slug = :str
+      ")
+      ->setParameters(array(
+        'str' => $slug
+      ))
+    ;
+  }
+  
 }
   

src/Muzich/HomeBundle/Controller/ShowController.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace Muzich\HomeBundle\Controller;
+
+use Muzich\CoreBundle\lib\Controller;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+
+class ShowController extends Controller
+{
+  
+  /**
+   * 
+   * 
+   * @Template()
+   */
+  public function showUserAction($slug)
+  {
+    try {
+      $viewed_user = $this->getDoctrine()
+        ->getRepository('MuzichCoreBundle:User')
+        ->findOneBySlug($slug)
+        ->getSingleResult()
+      ;
+    } catch (\Doctrine\ORM\NoResultException $e) {
+        throw $this->createNotFoundException('Utilisateur introuvable.');
+    }
+    
+    return array(
+      'viewed_user' => $viewed_user,
+      'elements' => $this->getShowedEntityElements($viewed_user->getId(), 'User')
+    );
+  }
+  
+  /**
+   * 
+   * 
+   * @Template()
+   */
+  public function showGroupAction($slug)
+  {
+    try {
+      $group = $this->getDoctrine()
+        ->getRepository('MuzichCoreBundle:Group')
+        ->findOneBySlug($slug)
+        ->getSingleResult()
+      ;
+    } catch (\Doctrine\ORM\NoResultException $e) {
+        throw $this->createNotFoundException('Groupe introuvable.');
+    }
+    
+    return array(
+      'group' => $group,
+      'elements' => $this->getShowedEntityElements($group->getId(), 'Group')
+    );
+  }
+  
+  /**
+   *
+   * @param Entity $entity
+   * @param string $type
+   * @return array 
+   */
+  protected function getShowedEntityElements($entity_id, $type)
+  {
+    $findBy = 'findBy'.$type;
+    return $this->getDoctrine()
+      ->getRepository('MuzichCoreBundle:Element')
+      ->$findBy($entity_id, 10)
+      
+      ->execute()
+    ;
+  }
+  
+}

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

@@ -2,4 +2,12 @@
 
 home:
   pattern:  /
-  defaults: { _controller: MuzichHomeBundle:Home:index }
+  defaults: { _controller: MuzichHomeBundle:Home:index }
+  
+show_user:
+  pattern: /user/{slug}
+  defaults: { _controller: MuzichHomeBundle:Show:showUser }
+  
+show_group:
+  pattern: /group/{slug}
+  defaults: { _controller: MuzichHomeBundle:Show:showGroup }

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

@@ -0,0 +1,11 @@
+{% extends "MuzichHomeBundle::layout.html.twig" %}
+
+{% block title %}{% endblock %}
+
+{% block content %}
+    
+  <b>{{ group.name }}</b>
+  
+  {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
+    
+{% endblock %}

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

@@ -0,0 +1,11 @@
+{% extends "MuzichHomeBundle::layout.html.twig" %}
+
+{% block title %}{% endblock %}
+
+{% block content %}
+    
+  <b>{{ viewed_user.name }}</b>
+  
+  {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
+    
+{% endblock %}

src/Muzich/MynetworkBundle/Resources/views/Mynetwork/index.html.twig

@@ -15,7 +15,7 @@
     <ul>
     {% for user in followeds_users %} 
       <li>
-        {{ user.username }}
+        <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>
       </li>
     {% endfor %}
     </ul>
@@ -26,7 +26,7 @@
     <ul>
     {% for group in followeds_groups %} 
       <li>
-        {{ group.name }}
+        <a href="{{ path('show_group', { 'slug': group.slug }) }}">{{ group.name }}</a>
       </li>
     {% endfor %}
     </ul>
@@ -37,7 +37,7 @@
     <ul>
     {% for user in followers_users %} 
       <li>
-        {{ user.username }}
+        <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>
       </li>
     {% endfor %}
     </ul>