Merge branch 'feature/v0.9.8.2/score' into stable/v0.9.8.2

src/Muzich/CoreBundle/DataFixtures/ORM/LoadUsersElementsFavoritesData.php

@@ -36,7 +36,15 @@ class LoadUsersElementsFavoritesData  extends AbstractFixture implements Ordered
     $favorite = new UsersElementsFavorites();
     $favorite->setUser($user);
     $favorite->setElement($element);
+    
+    if ($element->getOwner()->getId() != $user->getId())
+    {
+      $element->addPoints($this->container->getParameter('reputation_element_favorite_value'));
+      $element->increaseCountFavorited();
+    }
+    
     $this->entity_manager->persist($favorite);
+    $this->entity_manager->persist($element);
     //$this->addReference('user_tag_'.$user->getId().'_'.$tag->getId(), $userTag);
   }
   

src/Muzich/CoreBundle/Entity/Element.php

@@ -260,14 +260,18 @@ class Element
   protected $count_report;
   
   /**
+<<<<<<< HEAD
 <<<<<<< Updated upstream
 =======
+=======
+>>>>>>> feature/v0.9.8.2/score
    * @ORM\Column(type="integer", nullable=true)
    * @var int 
    */
   protected $count_favorited;
   
   /**
+<<<<<<< HEAD
    * @ORM\Column(type="integer", nullable=true)
    * @var int 
    */
@@ -275,6 +279,8 @@ class Element
   
   /**
 >>>>>>> Stashed changes
+=======
+>>>>>>> feature/v0.9.8.2/score
    * @ORM\Column(type="boolean", nullable=false)
    * @var int 
    */
@@ -834,6 +840,16 @@ class Element
     $this->points = $points;
   }
   
+  public function addPoints($points)
+  {
+    $this->points = $this->getPoints()+$points;
+  }
+  
+  public function removePoints($points)
+  {
+    $this->points = $this->getPoints()-$points;
+  }
+  
   public function getVoteGoodIds()
   {
     return json_decode($this->vote_good_ids, true);

src/Muzich/CoreBundle/Propagator/EventElement.php

@@ -110,9 +110,10 @@ class EventElement extends EventPropagator
     $security_context = new SecurityContext($added_by_user);
     if (!$security_context->actionIsAffectedBy(SecurityContext::AFFECT_NO_SCORING, SecurityContext::ACTION_ELEMENT_ADD_TO_FAVORITES))
     {
-      $ur->addPoints(
-        $this->container->getParameter('reputation_element_favorite_value')
-      );
+      $score_action = $this->container->getParameter('reputation_element_favorite_value');
+      $ur->addPoints($score_action);
+      $element->addPoints($score_action);
+      $element->increaseCountFavorited();
     }
     
     $uea = new UserEventAction($element->getOwner(), $this->container);
@@ -131,9 +132,10 @@ class EventElement extends EventPropagator
     $security_context = new SecurityContext($removed_by_user);
     if (!$security_context->actionIsAffectedBy(SecurityContext::AFFECT_NO_SCORING, SecurityContext::ACTION_ELEMENT_ADD_TO_FAVORITES))
     {
-      $ur->removePoints(
-        $this->container->getParameter('reputation_element_favorite_value')
-      );
+      $score_action = $this->container->getParameter('reputation_element_favorite_value');
+      $ur->removePoints($score_action);
+      $element->removePoints($score_action);
+      $element->uncreaseCountFavorited();
     }
   }
   

src/Muzich/FavoriteBundle/Controller/FavoriteController.php

@@ -60,6 +60,7 @@ class FavoriteController extends Controller
         $event = new EventElement($this->container);
         $event->addedToFavorites($element, $user);
         $em->persist($user);
+        $em->persist($element);
       }
       
       // On signale que cet user a modifié sa liste de favoris
@@ -129,6 +130,7 @@ class FavoriteController extends Controller
       $user->setData(User::DATA_FAV_UPDATED, true);
       
       $em->persist($element->getOwner());
+      $em->persist($element);
       $em->remove($fav);
       $em->flush();
     }