Merge branch 'unstable' into feature/viewprofile

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

@@ -37,19 +37,13 @@ class LoadElementData  extends AbstractFixture implements OrderedFixtureInterfac
   /**
    *  
    */
-  protected function createElement($reference_id, $name, $url, $tags, $type, $owner, $group = null, $date = null)
-  {
-    if (!$date)
-    {
-      $date = new \DateTime();
-    }
-    
+  protected function createElement($reference_id, $name, $url, $tags, $type, $owner, $group = null)
+  {    
     $element = new Element();
     $element->setName(ucfirst($name));
     $element->setUrl($url);
     $element->setType($type);
     $element->setOwner($owner);
-    $element->setDateAdded($date);
     if ($group)
       $element->setGroup($group);
     $this->addReference('element_'.$reference_id, $element);
@@ -65,7 +59,16 @@ class LoadElementData  extends AbstractFixture implements OrderedFixtureInterfac
   public function load($entity_manager)
   {
     $this->entity_manager = $entity_manager;
+    
+    // Timestampable stuff
+    $evm = new \Doctrine\Common\EventManager();
+    // ORM and ORM
+    $timestampableListener = new \Gedmo\Timestampable\TimestampableListener();
+    $evm->addEventSubscriber($timestampableListener);
+    // now this event manager should be passed to entity manager constructor
+    $this->entity_manager->getEventManager()->addEventSubscriber($timestampableListener);
 
+    // 
     $bux  = $this->entity_manager->merge($this->getReference('user_bux'));
     $jean = $this->entity_manager->merge($this->getReference('user_jean'));
     $paul = $this->entity_manager->merge($this->getReference('user_paul'));

src/Muzich/CoreBundle/Entity/Element.php

@@ -4,6 +4,7 @@ namespace Muzich\CoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use \Doctrine\Common\Collections\ArrayCollection;
+use Gedmo\Mapping\Annotation as Gedmo;
 
 
 /**
@@ -83,12 +84,20 @@ class Element
   protected $name;
   
   /**
-   * Date d'ajout dans le réseau
-   * 
+   * @var datetime $created
+   *
+   * @Gedmo\Timestampable(on="create")
    * @ORM\Column(type="datetime")
-   * @var type string
    */
-  protected $date_added;
+  private $created;
+
+  /**
+   * @var datetime $updated
+   *
+   * @ORM\Column(type="datetime")
+   * @Gedmo\Timestampable(on="update")
+   */
+  private $updated;
   
 
   /**
@@ -140,26 +149,6 @@ class Element
   {
     return $this->name;
   }
-
-  /**
-   * Set date_added
-   *
-   * @param datetime $dateAdded
-   */
-  public function setDateAdded($dateAdded)
-  {
-    $this->date_added = $dateAdded;
-  }
-
-  /**
-   * Get date_added
-   *
-   * @return datetime 
-   */
-  public function getDateAdded()
-  {
-    return $this->date_added;
-  }
   
   /**
    * Set type
@@ -267,4 +256,44 @@ class Element
   {
       return $this->group;
   }
+
+  /**
+   * Set created
+   *
+   * @param date $created
+   */
+  public function setCreated($created)
+  {
+      $this->created = $created;
+  }
+
+  /**
+   * Get created
+   *
+   * @return date 
+   */
+  public function getCreated()
+  {
+      return $this->created;
+  }
+
+  /**
+   * Set updated
+   *
+   * @param datetime $updated
+   */
+  public function setUpdated($updated)
+  {
+      $this->updated = $updated;
+  }
+
+  /**
+   * Get updated
+   *
+   * @return datetime 
+   */
+  public function getUpdated()
+  {
+      return $this->updated;
+  }
 }