aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authoradev <adev2000@gmail.com>2019-10-27 18:51:32 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2019-11-27 14:38:35 +0100
commit8197f08266256f55767666b90be47f585c7a6d28 (patch)
tree528d86ecd9fca0903c6747480474d251a19c817d /src/Wallabag
parenta4064347015e169b309153f214e2bb5ec17fde21 (diff)
downloadwallabag-8197f08266256f55767666b90be47f585c7a6d28.tar.gz
wallabag-8197f08266256f55767666b90be47f585c7a6d28.tar.zst
wallabag-8197f08266256f55767666b90be47f585c7a6d28.zip
API return an error with empty quote
Fix #4137
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/AnnotationBundle/Entity/Annotation.php1
-rw-r--r--src/Wallabag/AnnotationBundle/Form/NewAnnotationType.php1
-rw-r--r--src/Wallabag/ApiBundle/Controller/AnnotationRestController.php2
3 files changed, 3 insertions, 1 deletions
diff --git a/src/Wallabag/AnnotationBundle/Entity/Annotation.php b/src/Wallabag/AnnotationBundle/Entity/Annotation.php
index a180d504..ee7c1931 100644
--- a/src/Wallabag/AnnotationBundle/Entity/Annotation.php
+++ b/src/Wallabag/AnnotationBundle/Entity/Annotation.php
@@ -60,6 +60,7 @@ class Annotation
60 /** 60 /**
61 * @var string 61 * @var string
62 * 62 *
63 * @Assert\NotNull()
63 * @Assert\Length( 64 * @Assert\Length(
64 * max = 10000, 65 * max = 10000,
65 * maxMessage = "validator.quote_length_too_high" 66 * maxMessage = "validator.quote_length_too_high"
diff --git a/src/Wallabag/AnnotationBundle/Form/NewAnnotationType.php b/src/Wallabag/AnnotationBundle/Form/NewAnnotationType.php
index c73c3ded..aac6445c 100644
--- a/src/Wallabag/AnnotationBundle/Form/NewAnnotationType.php
+++ b/src/Wallabag/AnnotationBundle/Form/NewAnnotationType.php
@@ -18,6 +18,7 @@ class NewAnnotationType extends AbstractType
18 ]) 18 ])
19 ->add('quote', null, [ 19 ->add('quote', null, [
20 'empty_data' => null, 20 'empty_data' => null,
21 'trim' => false,
21 ]) 22 ])
22 ->add('ranges', CollectionType::class, [ 23 ->add('ranges', CollectionType::class, [
23 'entry_type' => RangeType::class, 24 'entry_type' => RangeType::class,
diff --git a/src/Wallabag/ApiBundle/Controller/AnnotationRestController.php b/src/Wallabag/ApiBundle/Controller/AnnotationRestController.php
index f59431e4..e5b3eb27 100644
--- a/src/Wallabag/ApiBundle/Controller/AnnotationRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/AnnotationRestController.php
@@ -37,7 +37,7 @@ 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"=false, "description"="Optional, quote for the annotation"}, 40 * {"name"="quote", "dataType"="string", "required"=true, "description"="Quote for the annotation"},
41 * {"name"="text", "dataType"="string", "required"=true, "description"=""}, 41 * {"name"="text", "dataType"="string", "required"=true, "description"=""},
42 * } 42 * }
43 * ) 43 * )