Mise en place du resharing, par le biais d'une boite de dialogue standart.

app/Resources/translations/userui.fr.yml

@@ -131,6 +131,12 @@ element:
       no:                Non
   proposition_tags:
     link_title:        Proposer des tags
+  reshare:
+    link_title:        Re-partager
+    confirm: 
+      sentence:          Re-partager ce partage ?
+      yes:               Oui
+      no:                Non
     
 comment:
   report:

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -271,14 +271,14 @@ class CoreController extends Controller
         {
           $html = $this->render('MuzichCoreBundle:SearchElement:li.element.html.twig', array(
             'element'     => $element,
-            'class_color' => 'odd'
+            'class_color' => 'odd'  // TODO: n'est plus utilisé
           ))->getContent();
         }
          else 
         {
           $html = $this->render('MuzichCoreBundle:SearchElement:li.element.html.twig', array(
             'element'     => $element,
-            'class_color' => 'odd',
+            'class_color' => 'odd',  // TODO: n'est plus utilisé
             'no_group_name' => true
           ))->getContent();
         }
@@ -380,44 +380,6 @@ class CoreController extends Controller
   }
   
   /**
-   * Cette méthode vérifie si l'élément qui vient d'être envoyé pourrais être
-   * associé a un groupe de l'utilisateur.
-   * 
-   * @param Element $element
-   * @return array
-   */
-  protected function isAddedElementCanBeInGroup(Element $element)
-  {
-    $element_tags = $element->getTags();
-    $groups = array();
-    
-    if ($element_tags)
-    {
-      foreach ($this->getUser()->getGroupsOwned() as $group)
-      {
-        foreach ($element_tags as $element_tag)
-        {
-          if ($group->hasThisTag($element_tag->getId()))
-          {
-            $groups[] = array(
-              'name' => $group->getName(),
-              'id'   => $group->getId(),
-              'url'  => $this->generateUrl('ajax_set_element_group', array(
-                'token'      => $this->getUser()->getPersonalHash(),
-                'element_id' => $element->getId(),
-                'group_id'   => $group->getId()
-              ))
-            );
-          }
-
-        }
-      }
-    }
-    
-    return $groups;
-  }
-  
-  /**
    * Action non ajax nettoyant la liste de tags du chercheur d'éléments
    * 
    * @return RedirectResponse 

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -6,6 +6,8 @@ use Muzich\CoreBundle\lib\Controller;
 use Muzich\CoreBundle\Managers\ElementManager;
 use Muzich\CoreBundle\Propagator\EventElement;
 use Muzich\CoreBundle\Entity\ElementTagsProposition;
+use Symfony\Component\HttpFoundation\Request;
+use Muzich\CoreBundle\Entity\Element;
 
 class ElementController extends Controller
 {
@@ -805,4 +807,68 @@ class ElementController extends Controller
     ));
   }
   
+  public function reshareAction(Request $request, $element_id, $token)
+  {
+    if (($response = $this->mustBeConnected(true)))
+    {
+      return $response;
+    }
+    
+    if ($this->getUser()->getPersonalHash('reshare_'.$element_id) != $token)
+    {
+      throw new \Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException();
+    }
+    
+    if (!($element = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')
+      ->findOneById($element_id)))
+    {
+      throw new \Symfony\Component\HttpKernel\Exception\NotFoundHttpException();
+    }
+    
+    if ($element->getOwner()->getId() == $this->getUserId())
+    {
+      throw new \Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException();
+    }
+    
+    
+    /**
+      * Bug lors des tests: L'user n'est pas 'lié' a celui en base par doctrine.
+      * Docrine le voit si on faire une requete directe.
+      */
+    $user = $this->getUser();
+    if ($this->container->getParameter('env') == 'test')
+    {
+      $user = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')->findOneById(
+        $this->container->get('security.context')->getToken()->getUser()->getId(),
+        array()
+      )->getSingleResult();
+    }
+    
+    // Pour le repartage on crée un nouvel élément
+    $element_reshared = new Element();
+    $element_reshared->setUrl($element->getUrl());
+    $element_reshared->setName($element->getName());
+    $element_reshared->addTags($element->getTags());
+    $element_reshared->setParent($element);
+
+    // On utilise le gestionnaire d'élément
+    $factory = new ElementManager($element_reshared, $this->getEntityManager(), $this->container);
+    $factory->proceedFill($user, false);
+    
+    // On se retrouve maintenant avec un nouvel element tout neuf
+    $this->persist($element_reshared);
+    $this->flush();
+    
+    $html_element = $this->render('MuzichCoreBundle:SearchElement:li.element.html.twig', array(
+      'element'     => $element_reshared,
+      'class_color' => 'odd' // TODO: n'est plus utilisé
+    ))->getContent();
+
+    return $this->jsonResponse(array(
+      'status' => 'success',
+      'html'   => $html_element,
+      'groups' => $this->isAddedElementCanBeInGroup($element_reshared)
+    ));
+  }
+  
 }

src/Muzich/CoreBundle/Entity/Element.php

@@ -58,6 +58,22 @@ class Element
   protected $owner;
 
   /**
+   * Objet parent (si a été repartagé)
+   * 
+   * @ORM\ManyToOne(targetEntity="Element", inversedBy="childs")
+   * @ORM\JoinColumn(name="element_parent_id", referencedColumnName="id")
+   */
+  protected $parent;
+  
+  
+  /**
+   * Liste des Elements qui on reshare cet element
+   * 
+   * @ORM\OneToMany(targetEntity="Element", mappedBy="parent")
+   */
+  protected $childs;
+
+  /**
    * Groupe de l'élément
    * 
    * @ORM\ManyToOne(targetEntity="Group", inversedBy="elements")
@@ -332,6 +348,18 @@ class Element
   {
     $this->tags = $tags;
   }
+  
+  /**
+   *
+   * @param Collection|Array $tags 
+   */
+  public function addTags($tags)
+  {
+    foreach ($tags as $tag)
+    {
+      $this->addTag($tag);
+    }
+  }
 
   /**
    * Set owner
@@ -759,4 +787,32 @@ class Element
     return $cm->userFollow($user_id);
   }
   
+  /**
+   * 
+   * @param Element $element 
+   */
+  public function setParent(Element $element = null)
+  {
+    $this->parent = $element;
+  }
+  
+  /**
+   *
+   * @return Element 
+   */
+  public function getParent()
+  {
+    return $this->parent;
+  }
+  
+  public function setChilds($elements)
+  {
+    $this->childs = $elements;
+  }
+  
+  public function getChilds()
+  {
+    return $this->childs;
+  }
+  
 }

src/Muzich/CoreBundle/Entity/User.php

@@ -617,9 +617,9 @@ class User extends BaseUser
     ;
   }
   
-  public function getPersonalHash()
+  public function getPersonalHash($salt_context = null)
   {
-    return hash('sha256', $this->getSalt().$this->getUsername());
+    return hash('sha256', $this->getSalt().$this->getUsername().$salt_context);
   }
   
   /**

src/Muzich/CoreBundle/Managers/ElementManager.php

@@ -69,10 +69,13 @@ class ElementManager
    * @param array $params
    * @param User $owner
    */
-  public function proceedFill(User $owner)
+  public function proceedFill(User $owner, $do_tags = true)
   {
     $this->element->setOwner($owner);
-    $this->element->setTagsWithIds($this->em, json_decode($this->element->getTags()));
+    if ($do_tags)
+    {
+      $this->element->setTagsWithIds($this->em, json_decode($this->element->getTags()));
+    }
     $this->determineType();
     $this->proceedExtraFields();
   }

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

@@ -118,6 +118,10 @@ ajax_report_element:
   pattern: /ajax/element/report/{element_id}/{token}
   defaults: { _controller: MuzichCoreBundle:Core:reportElement }
   
+ajax_reshare_element:
+  pattern: /ajax/element/reshare/{element_id}/{token}
+  defaults: { _controller: MuzichCoreBundle:Element:reshare }
+  
 ajax_element_propose_tags_open:
   pattern: /ajax/element/propose/tags/{element_id}
   defaults: { _controller: MuzichCoreBundle:Element:proposeTagsOpen }

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

@@ -64,6 +64,12 @@
           href="{{ path('ajax_report_element', {'element_id':element.id, 'token':app.user.getPersonalHash}) }}">
           <img src="{{ asset('bundles/muzichcore/img/1331832708_comment_alert.png') }}" alt="report" />
         </a>
+        
+        <a title="{{ 'element.reshare.link_title'|trans({}, 'userui') }}" 
+          class="element_reshare" 
+          href="{{ path('ajax_reshare_element', {'element_id':element.id, 'token':app.user.getPersonalHash('reshare_'~element.id)}) }}">
+          <img src="{{ asset('bundles/muzichcore/img/') }}" alt="re" />
+        </a>
       
       {% endif %}
       

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

@@ -1,5 +1,5 @@
 <li class="element {{ class_color }}" id="element_{{ element.id }}">
-             
+  
   {% include "MuzichCoreBundle:SearchElement:element.html.twig" %}
-
+  
 </li>

src/Muzich/CoreBundle/Resources/views/layout.html.twig

@@ -49,6 +49,9 @@
     string_commentreport_confirm_sentence = "{{ 'comment.report.confirm.sentence'|trans({}, 'userui') }}";
     string_commentreport_confirm_yes = "{{ 'comment.report.confirm.yes'|trans({}, 'userui') }}";
     string_commentreport_confirm_no = "{{ 'comment.report.confirm.no'|trans({}, 'userui') }}";
+    string_elementreshare_confirm_sentence = "{{ 'element.reshare.confirm.sentence'|trans({}, 'userui') }}";
+    string_elementreshare_confirm_yes = "{{ 'element.reshare.confirm.yes'|trans({}, 'userui') }}";
+    string_elementreshare_confirm_no = "{{ 'element.reshare.confirm.no'|trans({}, 'userui') }}";
     {% autoescape false %}
     string_search_tag_title = "{{ 'search_tag.title'|trans({}, 'userui') }}";
     {% endautoescape %}

src/Muzich/CoreBundle/lib/Controller.php

@@ -9,6 +9,7 @@ use Muzich\CoreBundle\Form\Search\ElementSearchForm;
 use Muzich\CoreBundle\Form\Element\ElementAddForm;
 use Symfony\Component\HttpFoundation\Response;
 use Muzich\CoreBundle\Searcher\GlobalSearcher;
+use Muzich\CoreBundle\Entity\Element;
 
 class Controller extends BaseController
 {
@@ -100,7 +101,7 @@ class Controller extends BaseController
    * @param boolean $personal_query
    * @param array $params
    * @param boolean $force_refresh
-   * @return type 
+   * @return \Muzich\CoreBundle\Entity\User 
    */
   protected function getUser($personal_query = false, $params = array(), $force_refresh = false)
   {
@@ -393,4 +394,70 @@ class Controller extends BaseController
     }
   }
   
+  /**
+   *
+   * @return \Doctrine\ORM\EntityManager 
+   */
+  public function getEntityManager()
+  {
+    return $this->getDoctrine()->getEntityManager();
+  }
+  
+  /**
+   *
+   * @param object $entity 
+   */
+  public function persist($entity)
+  {
+    $this->getEntityManager()->persist($entity);
+  }
+  
+  /**
+   * 
+   */
+  public function flush()
+  {
+    $this->getEntityManager()->flush();
+  }
+  
+  
+  
+  /**
+   * Cette méthode vérifie si l'élément qui vient d'être envoyé pourrais être
+   * associé a un groupe de l'utilisateur.
+   * 
+   * @param Element $element
+   * @return array
+   */
+  protected function isAddedElementCanBeInGroup(Element $element)
+  {
+    $element_tags = $element->getTags();
+    $groups = array();
+    
+    if ($element_tags)
+    {
+      foreach ($this->getUser()->getGroupsOwned() as $group)
+      {
+        foreach ($element_tags as $element_tag)
+        {
+          if ($group->hasThisTag($element_tag->getId()))
+          {
+            $groups[] = array(
+              'name' => $group->getName(),
+              'id'   => $group->getId(),
+              'url'  => $this->generateUrl('ajax_set_element_group', array(
+                'token'      => $this->getUser()->getPersonalHash(),
+                'element_id' => $element->getId(),
+                'group_id'   => $group->getId()
+              ))
+            );
+          }
+
+        }
+      }
+    }
+    
+    return $groups;
+  }
+  
 }

web/bundles/muzichcore/js/muzich.js

@@ -1089,18 +1089,9 @@ $(document).ready(function(){
       divSelect.find('select').val('network_personal');
     }
   });
-
-  // Ajout d'un element #ajouter
-  $('form[name="add"] input[type="submit"]').live('click', function(){
-    $('form[name="add"]').find('img.tag_loader').show();
-  });
-  $('form[name="add"]').ajaxForm(function(response) {
-    if (response.status == 'mustbeconnected')
-    {
-      $(location).attr('href', url_index);
-    }
-    
-    $('form[name="add"] img.tag_loader').hide();
+  
+  function element_add_proceed_json_response(response)
+  {
     if (response.status == 'success')
     {
       $('form[name="add"]').find('ul.error_list').remove();
@@ -1153,6 +1144,20 @@ $(document).ready(function(){
       
       $('form[name="add"]').prepend(ul_errors);
     }
+  }
+
+  // Ajout d'un element #ajouter
+  $('form[name="add"] input[type="submit"]').live('click', function(){
+    $('form[name="add"]').find('img.tag_loader').show();
+  });
+  $('form[name="add"]').ajaxForm(function(response) {
+    if (response.status == 'mustbeconnected')
+    {
+      $(location).attr('href', url_index);
+    }
+    
+    $('form[name="add"] img.tag_loader').hide();
+    element_add_proceed_json_response(response);
     
     return false;
   });
@@ -2028,5 +2033,41 @@ $(document).ready(function(){
       
     }
   });
+  
+  
+  /*
+   * reshare repartage
+   */
+  
+  $('a.element_reshare').jConfirmAction({
+    question : string_elementreshare_confirm_sentence, 
+    yesAnswer : string_elementreshare_confirm_yes, 
+    cancelAnswer : string_elementreshare_confirm_no,
+    onYes: function(link){
+      
+      $.getJSON(link.attr('href'), function(response){
+        
+        if (response.status == 'mustbeconnected')
+        {
+          $(location).attr('href', url_index);
+        }
+        
+        element_add_proceed_json_response(response);
+        $('div.question').fadeOut();
+        return false;
+        
+      });
+      
+      
+      
+      return false;
+    },
+    onOpen: function(link){
+      
+    },
+    onClose: function(link){
+      
+    }
+  });
 
 });