Rename rapsysair:calendar2 command to rapsysair:calendar

[airbundle] / Resources / config / doctrine / User.orm.yml

diff --git a/Resources/config/doctrine/User.orm.yml b/Resources/config/doctrine/User.orm.yml
index b6161cbf983cd1aa8467b99de01526dd340c36af..fcc5712ab64019680e735b7b42974b1d4a6528ae 100644 (file)
--- a/Resources/config/doctrine/User.orm.yml
+++ b/Resources/config/doctrine/User.orm.yml
@@ -26,6 +26,9 @@ Rapsys\AirBundle\Entity\User:
         snippets:
             targetEntity: Rapsys\AirBundle\Entity\Snippet
             mappedBy: user
         snippets:
             targetEntity: Rapsys\AirBundle\Entity\Snippet
             mappedBy: user

+        googleTokens:
+            targetEntity: Rapsys\AirBundle\Entity\GoogleToken
+            mappedBy: user

     manyToMany:
         dances:
             targetEntity: Rapsys\AirBundle\Entity\Dance
     manyToMany:
         dances:
             targetEntity: Rapsys\AirBundle\Entity\Dance


@@ -40,7 +43,10 @@ Rapsys\AirBundle\Entity\User:
                         name: dance_id
         subscribers:
             targetEntity: Rapsys\AirBundle\Entity\User
                         name: dance_id
         subscribers:
             targetEntity: Rapsys\AirBundle\Entity\User

-            inversedBy: subscriptions
+            mappedBy: subscriptions
+        subscriptions:
+            targetEntity: Rapsys\AirBundle\Entity\User
+            inversedBy: subscribers

             joinTable:
                 name: users_subscriptions
                 joinColumns:
             joinTable:
                 name: users_subscriptions
                 joinColumns:


@@ -48,10 +54,7 @@ Rapsys\AirBundle\Entity\User:
                         name: user_id
                 inverseJoinColumns:
                     id:
                         name: user_id
                 inverseJoinColumns:
                     id:

-                        name: subscriber_id
-        subscriptions:
-            targetEntity: Rapsys\AirBundle\Entity\User
-            mappedBy: subscribers
+                        name: subscribed_id

         locations:
             targetEntity: Rapsys\AirBundle\Entity\Location
             inversedBy: users
         locations:
             targetEntity: Rapsys\AirBundle\Entity\Location
             inversedBy: users