namespace Wallabag\AnnotationBundle\Controller;
use FOS\RestBundle\Controller\FOSRestController;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Wallabag\AnnotationBundle\Entity\Annotation;
+use Wallabag\AnnotationBundle\Form\EditAnnotationType;
+use Wallabag\AnnotationBundle\Form\NewAnnotationType;
use Wallabag\CoreBundle\Entity\Entry;
class WallabagAnnotationController extends FOSRestController
$total = count($annotationRows);
$annotations = ['total' => $total, 'rows' => $annotationRows];
- $json = $this->get('serializer')->serialize($annotations, 'json');
+ $json = $this->get('jms_serializer')->serialize($annotations, 'json');
return (new JsonResponse())->setJson($json);
}
$data = json_decode($request->getContent(), true);
$em = $this->getDoctrine()->getManager();
-
$annotation = new Annotation($this->getUser());
+ $annotation->setEntry($entry);
- $annotation->setText($data['text']);
- if (array_key_exists('quote', $data)) {
- $annotation->setQuote($data['quote']);
- }
- if (array_key_exists('ranges', $data)) {
- $annotation->setRanges($data['ranges']);
- }
+ $form = $this->get('form.factory')->createNamed('', NewAnnotationType::class, $annotation, [
+ 'csrf_protection' => false,
+ 'allow_extra_fields' => true,
+ ]);
+ $form->submit($data);
- $annotation->setEntry($entry);
+ if ($form->isValid()) {
+ $em->persist($annotation);
+ $em->flush();
- $em->persist($annotation);
- $em->flush();
+ $json = $this->get('jms_serializer')->serialize($annotation, 'json');
- $json = $this->get('serializer')->serialize($annotation, 'json');
+ return JsonResponse::fromJsonString($json);
+ }
- return (new JsonResponse())->setJson($json);
+ return $form;
}
/**
{
$data = json_decode($request->getContent(), true);
- if (!is_null($data['text'])) {
- $annotation->setText($data['text']);
- }
+ $form = $this->get('form.factory')->createNamed('', EditAnnotationType::class, $annotation, [
+ 'csrf_protection' => false,
+ 'allow_extra_fields' => true,
+ ]);
+ $form->submit($data);
- $em = $this->getDoctrine()->getManager();
- $em->flush();
+ if ($form->isValid()) {
+ $em = $this->getDoctrine()->getManager();
+ $em->persist($annotation);
+ $em->flush();
- $json = $this->get('serializer')->serialize($annotation, 'json');
+ $json = $this->get('jms_serializer')->serialize($annotation, 'json');
- return (new JsonResponse())->setJson($json);
+ return JsonResponse::fromJsonString($json);
+ }
+
+ return $form;
}
/**
$em->remove($annotation);
$em->flush();
- $json = $this->get('serializer')->serialize($annotation, 'json');
+ $json = $this->get('jms_serializer')->serialize($annotation, 'json');
return (new JsonResponse())->setJson($json);
}