aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authoradev <adev2000@gmail.com>2019-11-24 10:44:26 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2019-11-27 14:38:35 +0100
commit86c1751186ab71a54e33092cd9fb83c33917f619 (patch)
tree231dec4b585d351f9adb6b35f572e484194172c5 /src
parent8197f08266256f55767666b90be47f585c7a6d28 (diff)
downloadwallabag-86c1751186ab71a54e33092cd9fb83c33917f619.tar.gz
wallabag-86c1751186ab71a54e33092cd9fb83c33917f619.tar.zst
wallabag-86c1751186ab71a54e33092cd9fb83c33917f619.zip
Optionnal quote because the frontend does not use it
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/AnnotationBundle/Entity/Annotation.php1
-rw-r--r--src/Wallabag/AnnotationBundle/Form/NewAnnotationType.php2
-rw-r--r--src/Wallabag/ApiBundle/Controller/AnnotationRestController.php4
3 files changed, 3 insertions, 4 deletions
diff --git a/src/Wallabag/AnnotationBundle/Entity/Annotation.php b/src/Wallabag/AnnotationBundle/Entity/Annotation.php
index ee7c1931..a180d504 100644
--- a/src/Wallabag/AnnotationBundle/Entity/Annotation.php
+++ b/src/Wallabag/AnnotationBundle/Entity/Annotation.php
@@ -60,7 +60,6 @@ class Annotation
60 /** 60 /**
61 * @var string 61 * @var string
62 * 62 *
63 * @Assert\NotNull()
64 * @Assert\Length( 63 * @Assert\Length(
65 * max = 10000, 64 * max = 10000,
66 * maxMessage = "validator.quote_length_too_high" 65 * maxMessage = "validator.quote_length_too_high"
diff --git a/src/Wallabag/AnnotationBundle/Form/NewAnnotationType.php b/src/Wallabag/AnnotationBundle/Form/NewAnnotationType.php
index aac6445c..48bc2c59 100644
--- a/src/Wallabag/AnnotationBundle/Form/NewAnnotationType.php
+++ b/src/Wallabag/AnnotationBundle/Form/NewAnnotationType.php
@@ -17,7 +17,7 @@ class NewAnnotationType extends AbstractType
17 'empty_data' => '', 17 'empty_data' => '',
18 ]) 18 ])
19 ->add('quote', null, [ 19 ->add('quote', null, [
20 'empty_data' => null, 20 'empty_data' => '',
21 'trim' => false, 21 'trim' => false,
22 ]) 22 ])
23 ->add('ranges', CollectionType::class, [ 23 ->add('ranges', CollectionType::class, [
diff --git a/src/Wallabag/ApiBundle/Controller/AnnotationRestController.php b/src/Wallabag/ApiBundle/Controller/AnnotationRestController.php
index e5b3eb27..66693189 100644
--- a/src/Wallabag/ApiBundle/Controller/AnnotationRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/AnnotationRestController.php
@@ -37,8 +37,8 @@ class AnnotationRestController extends WallabagRestController
37 * @ApiDoc( 37 * @ApiDoc(
38 * requirements={ 38 * requirements={
39 * {"name"="ranges", "dataType"="array", "requirement"="\w+", "description"="The range array for the annotation"}, 39 * {"name"="ranges", "dataType"="array", "requirement"="\w+", "description"="The range array for the annotation"},
40 * {"name"="quote", "dataType"="string", "required"=true, "description"="Quote for the annotation"}, 40 * {"name"="quote", "dataType"="string", "description"="The annotated text"},
41 * {"name"="text", "dataType"="string", "required"=true, "description"=""}, 41 * {"name"="text", "dataType"="string", "required"=true, "description"="Content of annotation"},
42 * } 42 * }
43 * ) 43 * )
44 * 44 *