hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Corrected incoherences in entities

Browse Source
This commit is contained in:
Andrey
2013-08-06 16:47:20 +02:00
parent d788ac91f8
commit 718eb48669
5 changed files with 18 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/Entities/AggregateToken.php
View File

@@ -33,7 +33,7 @@ class AggregateToken
private $usr_id; private $usr_id;
/** /**
* @ORM\Column(type="string", length=128) * @ORM\Column(type="string", length=12, nullable=true)
*/ */
private $value; private $value;

22
lib/Doctrine/Entities/Feed.php
View File

@@ -40,7 +40,7 @@ class Feed implements FeedInterface
private $icon_url = false; private $icon_url = false;
/** /**
* @ORM\Column(type="integer") * @ORM\Column(type="integer", nullable=true)
*/ */
private $base_id; private $base_id;
@@ -50,7 +50,7 @@ class Feed implements FeedInterface
private $title; private $title;
/** /**
* @ORM\Column(type="string", length=128) * @ORM\Column(type="string", length=1024, nullable=true)
*/ */
private $subtitle; private $subtitle;
@@ -67,30 +67,18 @@ class Feed implements FeedInterface
private $updated_on; private $updated_on;
/** /**
* @ORM\OneToMany( * @ORM\OneToMany(targetEntity="FeedPublisher", mappedBy="feed", cascade={"ALL"})
* targetEntity="FeedPublisher",
* mappedBy="feed",
* cascade=["ALL"]
* )
*/ */
private $publishers; private $publishers;
/** /**
* @ORM\OneToMany( * @ORM\OneToMany(targetEntity="FeedEntry", mappedBy="feed", cascade={"ALL"})
* targetEntity="FeedEntry",
* mappedBy="feed",
* cascade=["ALL"]
* )
* @ORM\OrderBy({"created_on" = "ASC"}) * @ORM\OrderBy({"created_on" = "ASC"})
*/ */
private $entries; private $entries;
/** /**
* @ORM\OneToMany( * @ORM\OneToMany(targetEntity="FeedToken", mappedBy="feed", cascade={"ALL"})
* targetEntity="FeedToken",
* mappedBy="feed",
* cascade=["ALL"]
* )
*/ */
private $tokens; private $tokens;

6
lib/Doctrine/Entities/FeedEntry.php
View File

@@ -60,11 +60,7 @@ class FeedEntry
private $updated_on; private $updated_on;
/** /**
* @ORM\OneToMany( * @ORM\OneToMany(targetEntity="FeedItem", mappedBy="entry", cascade={"ALL"})
* targetEntity="FeedItem",
* mappedBy="entry",
* cascade=["ALL"]
* )
* @ORM\OrderBy({"ord" = "ASC"}) * @ORM\OrderBy({"ord" = "ASC"})
*/ */
private $items; private $items;

13
lib/Doctrine/Entities/FeedItem.php
View File

@@ -17,9 +17,7 @@ use Doctrine\ORM\Mapping as ORM;
use Gedmo\Mapping\Annotation as Gedmo; use Gedmo\Mapping\Annotation as Gedmo;
/** /**
* @ORM\Table(name="FeedItems", uniqueConstraints={@ORM\UniqueConstraint(name="lookup_unique_idx", columns={ * @ORM\Table(name="FeedItems", uniqueConstraints={@ORM\UniqueConstraint(name="lookup_unique_idx", columns={"entry_id","sbas_id","record_id"})})
* "entry_id","sbas_id","record_id"
* }})
* @ORM\Entity(repositoryClass="Repositories\FeedItemRepository") * @ORM\Entity(repositoryClass="Repositories\FeedItemRepository")
* @HasLifecycleCallbacks * @HasLifecycleCallbacks
*/ */
@@ -42,6 +40,11 @@ class FeedItem
*/ */
private $sbas_id; private $sbas_id;
/**
* @ORM\Column(type="integer")
*/
private $ord;
/** /**
* @Gedmo\Timestampable(on="create") * @Gedmo\Timestampable(on="create")
* @ORM\Column(type="datetime") * @ORM\Column(type="datetime")
@@ -138,10 +141,6 @@ class FeedItem
{ {
return $this->entry; return $this->entry;
} }
/**
* @var integer
*/
private $ord;
/** /**
* Set ord * Set ord

9
lib/Doctrine/Entities/FeedToken.php
View File

@@ -32,6 +32,11 @@ class FeedToken
*/ */
private $usr_id; private $usr_id;
/**
* @ORM\Column(type="string", length=12, nullable=true)
*/
private $value;
/** /**
* @ORM\ManyToOne(targetEntity="Feed", inversedBy="tokens", cascade={"persist"}) * @ORM\ManyToOne(targetEntity="Feed", inversedBy="tokens", cascade={"persist"})
* @ORM\JoinColumn(name="feed_id", referencedColumnName="id") * @ORM\JoinColumn(name="feed_id", referencedColumnName="id")
@@ -93,10 +98,6 @@ class FeedToken
{ {
return $this->feed; return $this->feed;
} }
/**
* @ORM\Column(type="string", length=128)
*/
private $value;
/** /**
* Set value * Set value