Merge pull request #1653 from wallabag/v2-annotator-comments

V2 annotator comments

4 files changed, 7 insertions, 0 deletions

diff --git a/app/AppKernel.php b/app/AppKernel.php
index 08c9cc27..30ac7463 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -35,6 +35,7 @@ class AppKernel extends Kernel
             new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
             new Craue\ConfigBundle\CraueConfigBundle(),
             new Lexik\Bundle\MaintenanceBundle\LexikMaintenanceBundle(),
+            new Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
diff --git a/app/config/routing.yml b/app/config/routing.yml
index c491d35d..6a6aa6ac 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -1,3 +1,7 @@
+wallabag_annotation:
+  type : rest
+  resource: "@WallabagAnnotationBundle/Resources/config/routing_annotations.yml"
+
 wallabag_import:
     resource: "@WallabagImportBundle/Controller/"
     type:     annotation
diff --git a/app/config/routing_rest.yml b/app/config/routing_rest.yml
index 0a64ad78..52d395dd 100644
--- a/app/config/routing_rest.yml
+++ b/app/config/routing_rest.yml
@@ -1,3 +1,4 @@
 Rest_Wallabag:
   type : rest
   resource: "@WallabagApiBundle/Resources/config/routing_rest.yml"
+
diff --git a/app/config/security.yml b/app/config/security.yml
index 7c10889f..7f05123a 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -58,4 +58,5 @@ security:
         - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/settings, roles: ROLE_SUPER_ADMIN }
+        - { path: ^/annotations, roles: ROLE_USER }
         - { path: ^/, roles: ROLE_USER }