integration, presque termine

app/Resources/translations/network.fr.yml

@@ -11,7 +11,7 @@ search:
     submit_value:       Rechercher
 users:                Utilisateurs
 groups:               Groupes
-followed_by:          Vous êtes suivis par
+followed_by:          Ces utilisateurs suivent désormais vos publications
 
 favorites:
   your_favorites:     Vos favoris

app/Resources/translations/userui.fr.yml

@@ -200,8 +200,18 @@ autoplay:
 
 events:
   view:
+    link_delete:         Considérer comme vu(s)
     title:
       comments:          Commentaires
       nvxfav:            Mis en favoris
       tagsprop:          Proposition de tags
+    text:
+      comments:          |
+                          Sont affichés ci-dessous vos partages qui ont été commentés, ainsi que les
+                          partages sur lesquels vous avez rédigé un commentaire et souhaité être avertis des nouveaux
+                          commentaires.
+      nvxfav:            |
+                          Sont affichés ci-dessous vos partages qui ont été mis en favoris par d'autres utilisateurs
+      tagsprop:          |
+                          Sont affichés ci-dessous vos partages pour lesquels ont vous propose une nouvelle liste de tags
       

src/Muzich/MynetworkBundle/Controller/MynetworkController.php

@@ -18,11 +18,11 @@ class MynetworkController extends Controller
   public function indexAction($event_id)
   {    
     $user = $this->getUser(true, array('join' => array(
-      'followeds_users', 'followers_users', 'followeds_groups'
+      'followers_users'//, 'followeds_users', 'followeds_groups'
     )));
     
-    $followeds_users = $user->getFollowedsUsers();
-    $followeds_groups = $user->getFollowedGroups();
+    //$followeds_users = $user->getFollowedsUsers();
+    //$followeds_groups = $user->getFollowedGroups();
     $followers_users = $user->getFollowersUsers();
     
     if ($event_id)
@@ -35,14 +35,14 @@ class MynetworkController extends Controller
 
       if ($event->getUser()->getId() != $this->getUserId())
       {
-        throw $this->createNotFoundException('NotAllowed');
+        throw $this->createNotFoundException();
       }
       $followers_users = $this->proceedForEvent($event, $followers_users, $event_id);
     }
     
     return array(
-      'followeds_users' => $followeds_users,
-      'followeds_groups' => $followeds_groups,
+      //'followeds_users' => $followeds_users,
+      //'followeds_groups' => $followeds_groups,
       'followers_users' => $followers_users
     );
   }
@@ -59,9 +59,8 @@ class MynetworkController extends Controller
     {
       if (in_array($user->getId(), $ids))
       {
-        $user->addLiveData('new', true);
+        $followers_users_new[] = $user;
       }
-      $followers_users_new[] = $user;
     }
     
     return $followers_users_new;

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

@@ -1,52 +1,22 @@
 {% extends "MuzichMynetworkBundle::layout.html.twig" %}
 
 {% block title %}Mon réseau{% endblock %}
+{% block mainbox_classes %}mainbox_padding{% endblock %}
 
 {% block content %}
   
-  {% if followeds_users %}
-    <b>{{ 'users'|trans({}, 'network') }}</b>
-    <ul id="followeds_users" class="inline">
-    {% for user in followeds_users %} 
-      <li>
-        <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>
-      </li>
-    {% endfor %}
-    </ul>
-  {% endif %}
-  
-  {% if followeds_groups %}
-    <b>{{ 'groups'|trans({}, 'network') }}</b>
-    <ul id="followeds_groups" class="inline">
-    {% for group in followeds_groups %} 
-      <li>
-        <a href="{{ path('show_group', { 'slug': group.slug }) }}">{{ group.name }}</a>
-      </li>
-    {% endfor %}
-    </ul>
-  {% endif %}
+  <h1>{{ 'followed_by'|trans({}, 'network') }}</h1>
   
   {% if followers_users %}
-    <b>{{ 'followed_by'|trans({}, 'network') }}</b>
+    
     <ul id="followers_users" class="inline">
     {% for user in followers_users %} 
-      <li {% if user.hasLiveData('new', true) %}class="new"{% endif %}>
+      <li>
         <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>
       </li>
     {% endfor %}
     </ul>
   {% endif %}
-    
-  {% if followeds_users|length < 1  %}
-  {% if followeds_groups|length < 1 %}
-  {% if followers_users|length < 1 %}
   
-    <br />
-    {{ 'nothing'|trans({}, 'network') }}
-    <br /><br />
-    
-  {% endif %}
-  {% endif %}
-  {% endif %}
 
 {% endblock %}

src/Muzich/UserBundle/Controller/EventController.php

@@ -3,9 +3,12 @@
 namespace Muzich\UserBundle\Controller;
 
 use Muzich\CoreBundle\lib\Controller;
+use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
 
 class EventController extends Controller
 {
+  
+  protected $event;
     
   public function infoBarAction()
   {
@@ -60,8 +63,7 @@ class EventController extends Controller
     $es->setIdsDisplay($event->getType());
     
     $this->setElementSearcherParams($es->getParams(), $user->getPersonalHash($event->getId()));
-    //$this->getDoctrine()->getEntityManager()->remove($event);
-    //$this->getDoctrine()->getEntityManager()->flush();
+    
         
     $elements = $es->getElements($this->getDoctrine(), $this->getUserId());
     
@@ -72,4 +74,37 @@ class EventController extends Controller
     ));
   }
   
+  public function userCanAccessToThisEvent($event_id)
+  {
+    if (!($this->event = $this->getDoctrine()->getRepository('MuzichCoreBundle:Event')
+      ->findOneById($event_id)))
+    {
+      throw $this->createNotFoundException();
+    }
+    
+    if ($this->event->getUser()->getId() != $this->getUserId())
+    {
+      throw $this->createNotFoundException();
+    }
+  }
+  
+  public function userUseCorrectToken($token)
+  {
+    if ($this->getUser()->getPersonalHash($this->event->getId()) != $token)
+    {
+      throw new AccessDeniedException();
+    }
+  }
+  
+  public function deleteAction($event_id, $token)
+  {
+    $this->userCanAccessToThisEvent($event_id);
+    $this->userUseCorrectToken($token);
+    
+    $this->getEntityManager()->remove($this->event);
+    $this->flush();
+    
+    return $this->redirect($this->generateUrl('home'));
+  }
+  
 }

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

@@ -37,3 +37,10 @@ update_address:
 event_view_elements:
   pattern: /event/view/elements/{event_id}
   defaults: { _controller: MuzichUserBundle:Event:viewElements }
+
+event_delete:
+  pattern: /event/delete/{event_id}/{token}
+  defaults: { _controller: MuzichUserBundle:Event:delete }
+  requirements:
+    _method:  GET
+    message_id: \d+

src/Muzich/UserBundle/Resources/views/Event/elements.html.twig

@@ -1,25 +1,49 @@
 {% extends "MuzichHomeBundle::layout.html.twig" %}
 
-{% block title %}TODO{% endblock %}
+{% block title %}
+  {% if event.type == event_const('TYPE_COMMENT_ADDED_ELEMENT') %}
+    {{ 'events.view.title.comments'|trans({}, 'userui') }}
+  {% endif %}
+  {% if event.type == event_const('TYPE_FAV_ADDED_ELEMENT') %}
+    {{ 'events.view.title.nvxfav'|trans({}, 'userui') }}
+  {% endif %}
+  {% if event.type == event_const('TYPE_TAGS_PROPOSED') %}
+    {{ 'events.view.title.tagsprop'|trans({}, 'userui') }}
+  {% endif %}
+{% endblock %}
 {% block mainbox_classes %}mainbox_nopadding{% endblock %}
 
 {% block content %}
 
   <div class="top_tools">
     
+    <div class="show_options">
+     
+      <a class="button darkbutton" href="{{ path('event_delete', {
+        'event_id' : event.id,
+        'token'    : app.user.getPersonalHash(event.id)
+      }) }}" >
+        {{ 'events.view.link_delete'|trans({}, 'userui') }}
+      </a>
+    
+    </div>
+    
     {% if event.type == event_const('TYPE_COMMENT_ADDED_ELEMENT') %}
       
       <h1>{{ 'events.view.title.comments'|trans({}, 'userui') }}</h1>
+      <p>{{ 'events.view.text.comments'|trans({}, 'userui') }}</p>
       
     {% endif %}
     {% if event.type == event_const('TYPE_FAV_ADDED_ELEMENT') %}
       
       <h1>{{ 'events.view.title.nvxfav'|trans({}, 'userui') }}</h1>
+      <p>{{ 'events.view.text.nvxfav'|trans({}, 'userui') }}</p>
       
     {% endif %}
     {% if event.type == event_const('TYPE_TAGS_PROPOSED') %}
       
       <h1>{{ 'events.view.title.tagsprop'|trans({}, 'userui') }}</h1>
+      <p>{{ 'events.view.text.tagsprop'|trans({}, 'userui') }}</p>
       
     {% endif %}