diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2019-12-04 16:09:49 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-04 16:09:49 -0800 |
commit | d816ef0530358c5b6fb757b5cfb4ca142b26ce90 (patch) | |
tree | 3421186de099cf0e6f5338486187541d0a5f96e9 /src/Wallabag | |
parent | 43141054d1534c82ac181cdbe693fd13b787b281 (diff) | |
parent | 6a0d49ab7a8ac9e00f9df34b37b6d3e1ab40f2a9 (diff) | |
download | wallabag-d816ef0530358c5b6fb757b5cfb4ca142b26ce90.tar.gz wallabag-d816ef0530358c5b6fb757b5cfb4ca142b26ce90.tar.zst wallabag-d816ef0530358c5b6fb757b5cfb4ca142b26ce90.zip |
Merge pull request #4161 from aaa2000/bug-empty-quote
API return an error with empty quote
Diffstat (limited to 'src/Wallabag')
-rw-r--r-- | src/Wallabag/AnnotationBundle/Form/NewAnnotationType.php | 3 | ||||
-rw-r--r-- | src/Wallabag/ApiBundle/Controller/AnnotationRestController.php | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Wallabag/AnnotationBundle/Form/NewAnnotationType.php b/src/Wallabag/AnnotationBundle/Form/NewAnnotationType.php index c73c3ded..48bc2c59 100644 --- a/src/Wallabag/AnnotationBundle/Form/NewAnnotationType.php +++ b/src/Wallabag/AnnotationBundle/Form/NewAnnotationType.php | |||
@@ -17,7 +17,8 @@ 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 | ]) | 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..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"=false, "description"="Optional, 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 | * |