diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Entity')
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/Config.php | 57 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/Entry.php | 39 |
2 files changed, 93 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php index 69393ac9..0b75270d 100644 --- a/src/Wallabag/CoreBundle/Entity/Config.php +++ b/src/Wallabag/CoreBundle/Entity/Config.php | |||
@@ -16,6 +16,9 @@ use Wallabag\UserBundle\Entity\User; | |||
16 | */ | 16 | */ |
17 | class Config | 17 | class Config |
18 | { | 18 | { |
19 | const REDIRECT_TO_HOMEPAGE = 0; | ||
20 | const REDIRECT_TO_CURRENT_PAGE = 1; | ||
21 | |||
19 | /** | 22 | /** |
20 | * @var int | 23 | * @var int |
21 | * | 24 | * |
@@ -88,6 +91,20 @@ class Config | |||
88 | private $pocketConsumerKey; | 91 | private $pocketConsumerKey; |
89 | 92 | ||
90 | /** | 93 | /** |
94 | * @var int | ||
95 | * | ||
96 | * @ORM\Column(name="action_mark_as_read", type="integer", nullable=true) | ||
97 | */ | ||
98 | private $actionMarkAsRead; | ||
99 | |||
100 | /** | ||
101 | * @var int | ||
102 | * | ||
103 | * @ORM\Column(name="list_mode", type="integer", nullable=true) | ||
104 | */ | ||
105 | private $listMode; | ||
106 | |||
107 | /** | ||
91 | * @ORM\OneToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="config") | 108 | * @ORM\OneToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="config") |
92 | */ | 109 | */ |
93 | private $user; | 110 | private $user; |
@@ -310,6 +327,46 @@ class Config | |||
310 | } | 327 | } |
311 | 328 | ||
312 | /** | 329 | /** |
330 | * @return int | ||
331 | */ | ||
332 | public function getActionMarkAsRead() | ||
333 | { | ||
334 | return $this->actionMarkAsRead; | ||
335 | } | ||
336 | |||
337 | /** | ||
338 | * @param int $actionMarkAsRead | ||
339 | * | ||
340 | * @return Config | ||
341 | */ | ||
342 | public function setActionMarkAsRead($actionMarkAsRead) | ||
343 | { | ||
344 | $this->actionMarkAsRead = $actionMarkAsRead; | ||
345 | |||
346 | return $this; | ||
347 | } | ||
348 | |||
349 | /** | ||
350 | * @return int | ||
351 | */ | ||
352 | public function getListMode() | ||
353 | { | ||
354 | return $this->listMode; | ||
355 | } | ||
356 | |||
357 | /** | ||
358 | * @param int $listMode | ||
359 | * | ||
360 | * @return Config | ||
361 | */ | ||
362 | public function setListMode($listMode) | ||
363 | { | ||
364 | $this->listMode = $listMode; | ||
365 | |||
366 | return $this; | ||
367 | } | ||
368 | |||
369 | /** | ||
313 | * @param TaggingRule $rule | 370 | * @param TaggingRule $rule |
314 | * | 371 | * |
315 | * @return Config | 372 | * @return Config |
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php index f2da3f4d..3cf9ac1a 100644 --- a/src/Wallabag/CoreBundle/Entity/Entry.php +++ b/src/Wallabag/CoreBundle/Entity/Entry.php | |||
@@ -19,7 +19,11 @@ use Wallabag\AnnotationBundle\Entity\Annotation; | |||
19 | * | 19 | * |
20 | * @XmlRoot("entry") | 20 | * @XmlRoot("entry") |
21 | * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\EntryRepository") | 21 | * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\EntryRepository") |
22 | * @ORM\Table(name="`entry`") | 22 | * @ORM\Table( |
23 | * name="`entry`", | ||
24 | * options={"collate"="utf8mb4_unicode_ci", "charset"="utf8mb4"}, | ||
25 | * indexes={@ORM\Index(name="created_at", columns={"created_at"})} | ||
26 | * ) | ||
23 | * @ORM\HasLifecycleCallbacks() | 27 | * @ORM\HasLifecycleCallbacks() |
24 | * @Hateoas\Relation("self", href = "expr('/api/entries/' ~ object.getId())") | 28 | * @Hateoas\Relation("self", href = "expr('/api/entries/' ~ object.getId())") |
25 | */ | 29 | */ |
@@ -177,6 +181,15 @@ class Entry | |||
177 | private $isPublic; | 181 | private $isPublic; |
178 | 182 | ||
179 | /** | 183 | /** |
184 | * @var string | ||
185 | * | ||
186 | * @ORM\Column(name="http_status", type="text", nullable=true) | ||
187 | * | ||
188 | * @Groups({"entries_for_user", "export_all"}) | ||
189 | */ | ||
190 | private $httpStatus; | ||
191 | |||
192 | /** | ||
180 | * @Exclude | 193 | * @Exclude |
181 | * | 194 | * |
182 | * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="entries") | 195 | * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="entries") |
@@ -190,10 +203,10 @@ class Entry | |||
190 | * @ORM\JoinTable( | 203 | * @ORM\JoinTable( |
191 | * name="entry_tag", | 204 | * name="entry_tag", |
192 | * joinColumns={ | 205 | * joinColumns={ |
193 | * @ORM\JoinColumn(name="entry_id", referencedColumnName="id") | 206 | * @ORM\JoinColumn(name="entry_id", referencedColumnName="id", onDelete="cascade") |
194 | * }, | 207 | * }, |
195 | * inverseJoinColumns={ | 208 | * inverseJoinColumns={ |
196 | * @ORM\JoinColumn(name="tag_id", referencedColumnName="id") | 209 | * @ORM\JoinColumn(name="tag_id", referencedColumnName="id", onDelete="cascade") |
197 | * } | 210 | * } |
198 | * ) | 211 | * ) |
199 | */ | 212 | */ |
@@ -665,4 +678,24 @@ class Entry | |||
665 | { | 678 | { |
666 | $this->uuid = null; | 679 | $this->uuid = null; |
667 | } | 680 | } |
681 | |||
682 | /** | ||
683 | * @return int | ||
684 | */ | ||
685 | public function getHttpStatus() | ||
686 | { | ||
687 | return $this->httpStatus; | ||
688 | } | ||
689 | |||
690 | /** | ||
691 | * @param int $httpStatus | ||
692 | * | ||
693 | * @return Entry | ||
694 | */ | ||
695 | public function setHttpStatus($httpStatus) | ||
696 | { | ||
697 | $this->httpStatus = $httpStatus; | ||
698 | |||
699 | return $this; | ||
700 | } | ||
668 | } | 701 | } |