diff options
author | Paulino Michelazzo <paulino@michelazzo.com.br> | 2016-10-18 22:48:23 +0200 |
---|---|---|
committer | Paulino Michelazzo <paulino@michelazzo.com.br> | 2016-10-18 22:48:23 +0200 |
commit | 99731f0bb1f6fd2815eeb9af504ce86df927657b (patch) | |
tree | b080efc608d2bbd52b77a4a0067402007f50c5a8 /src/Wallabag/AnnotationBundle/Entity | |
parent | 3a3c6b866b52721431bed22426d9abfcd0d2dfe0 (diff) | |
parent | 7180aaed45dce62e40620a9e4b202526ebd6a3bb (diff) | |
download | wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.gz wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.zst wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.zip |
Merge remote-tracking branch 'wallabag/master'
Diffstat (limited to 'src/Wallabag/AnnotationBundle/Entity')
-rw-r--r-- | src/Wallabag/AnnotationBundle/Entity/Annotation.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/Wallabag/AnnotationBundle/Entity/Annotation.php b/src/Wallabag/AnnotationBundle/Entity/Annotation.php index 90ee7c2d..c48d8731 100644 --- a/src/Wallabag/AnnotationBundle/Entity/Annotation.php +++ b/src/Wallabag/AnnotationBundle/Entity/Annotation.php | |||
@@ -7,6 +7,7 @@ use JMS\Serializer\Annotation\ExclusionPolicy; | |||
7 | use JMS\Serializer\Annotation\Exclude; | 7 | use JMS\Serializer\Annotation\Exclude; |
8 | use JMS\Serializer\Annotation\VirtualProperty; | 8 | use JMS\Serializer\Annotation\VirtualProperty; |
9 | use JMS\Serializer\Annotation\SerializedName; | 9 | use JMS\Serializer\Annotation\SerializedName; |
10 | use JMS\Serializer\Annotation\Groups; | ||
10 | use Wallabag\UserBundle\Entity\User; | 11 | use Wallabag\UserBundle\Entity\User; |
11 | use Wallabag\CoreBundle\Entity\Entry; | 12 | use Wallabag\CoreBundle\Entity\Entry; |
12 | 13 | ||
@@ -33,6 +34,8 @@ class Annotation | |||
33 | * @var string | 34 | * @var string |
34 | * | 35 | * |
35 | * @ORM\Column(name="text", type="text") | 36 | * @ORM\Column(name="text", type="text") |
37 | * | ||
38 | * @Groups({"entries_for_user", "export_all"}) | ||
36 | */ | 39 | */ |
37 | private $text; | 40 | private $text; |
38 | 41 | ||
@@ -54,6 +57,8 @@ class Annotation | |||
54 | * @var string | 57 | * @var string |
55 | * | 58 | * |
56 | * @ORM\Column(name="quote", type="string") | 59 | * @ORM\Column(name="quote", type="string") |
60 | * | ||
61 | * @Groups({"entries_for_user", "export_all"}) | ||
57 | */ | 62 | */ |
58 | private $quote; | 63 | private $quote; |
59 | 64 | ||
@@ -61,6 +66,8 @@ class Annotation | |||
61 | * @var array | 66 | * @var array |
62 | * | 67 | * |
63 | * @ORM\Column(name="ranges", type="array") | 68 | * @ORM\Column(name="ranges", type="array") |
69 | * | ||
70 | * @Groups({"entries_for_user", "export_all"}) | ||
64 | */ | 71 | */ |
65 | private $ranges; | 72 | private $ranges; |
66 | 73 | ||