Evolution #780: Lien permanent

app/Resources/translations/elements.en.yml

@@ -12,6 +12,7 @@ noelements:
   nofound_anymore:      Share not found (maybe deleted by owner)
   
 element:
+  permalink:            Permalink
   favorite:
     add:                Add to faves
     remove:             Remove from faves

app/Resources/translations/elements.fr.yml

@@ -11,6 +11,7 @@ noelements:
   nofound_anymore:      Le partage est introuvable (il peut avoir été supprimé par son auteur)
   
 element:
+  permalink:            Lien permanant
   favorite:
     add:                Ajouter à mes favoris
     remove:             Retirer de mes favoris

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

@@ -121,7 +121,11 @@ element_new_get:
 element_remove_from_group:
   pattern: /ajax/group/{group_id}/remove-element/{element_id}/{token}
   defaults: { _controller: MuzichCoreBundle:Element:removeFromGroup }
-  
+
+element_show_one:
+  pattern: /song/{element_id}/{element_slug}
+  defaults: { _controller: MuzichHomeBundle:Home:showOneElement }
+
 ##
 
 ajax_tag_add_to_favorites:
@@ -217,4 +221,4 @@ share_from:
 get_csrf_token:
   pattern: /ajax/getcsrf
   defaults: { _controller: MuzichCoreBundle:Core:getCsrfToken }
-  
+  

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

@@ -110,7 +110,8 @@ security:
         - { path: ^/(?:fr|en)/group, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/(?:fr|en)/search, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/(?:fr|en)/playlist, role: IS_AUTHENTICATED_ANONYMOUSLY }
-        - { path: ^/(?:fr|en)/my-groups/add, role: IS_AUTHENTICATED_ANONYMOUSLY }                  
+        - { path: ^/(?:fr|en)/my-groups/add, role: IS_AUTHENTICATED_ANONYMOUSLY }  
+        - { path: ^/(?:fr|en)/song, role: IS_AUTHENTICATED_ANONYMOUSLY }                  
           
         - { path: ^/, roles: ROLE_USER }
         

src/Muzich/CoreBundle/Resources/views/SearchElement/element.html.twig

@@ -284,11 +284,17 @@
       
       <span class="element_name">
         {% if element.embed %}
-          <a href="#" class="element_open element_name_embed_open_link">
+          <a href="{{ path('element_show_one', {
+            'element_id' : element.id,
+            'element_slug' : element.slug
+          }) }}" class="element_open element_name_embed_open_link">
             {{ element.name }}
           </a>
         {% else %}
-          <a href="{{ element.url }}" class="element_open" target="_blank">
+          <a href="{{ path('element_show_one', {
+            'element_id' : element.id,
+            'element_slug' : element.slug
+          }) }}" class="element_open" target="_blank">
             {{ element.name }}
           </a>
         {% endif %}

src/Muzich/HomeBundle/Controller/HomeController.php

@@ -13,11 +13,12 @@ class HomeController extends Controller
    * Page d'accueil ("home") de l'utilisateur. Cette page regroupe le fil
    * d'éléments général et personalisable et de quoi ajouter un élément.
    * 
-   * @Template()
    */
-  public function indexAction($count = null, $network = null, $login = false)
+  public function indexAction($count = null, $network = null, $login = false, $search_object = null)
   {
-    $search_object = $this->getElementSearcher($count);
+    if (!$search_object)
+      $search_object = $this->getElementSearcher($count);
+    
     $user = $this->getUser(true, array('join' => array(
       'groups_owned'
     )), true);
@@ -32,7 +33,7 @@ class HomeController extends Controller
     
     $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId(true));
     
-    return array(
+    return $this->render('MuzichHomeBundle:Home:index.html.twig', array(
       'search_tags_id'   => $search_object->getTags(),
       'ids_display'      => $search_object->getIdsDisplay(),
       'user'             => $user,
@@ -46,7 +47,15 @@ class HomeController extends Controller
       'display_launch_demo' => true,
       'login'            => $login,
       'email_token'      => $this->getEmailTokenIfExist()
-    );
+    ));
+  }
+  
+  public function showOneElementAction($element_id)
+  {
+    $es = $this->getNewElementSearcher();
+    $es->setNoTags();
+    $es->setIds(array($element_id));
+    return $this->indexAction(null, null, false, $es);
   }
   
   protected function getEmailTokenIfExist()