Merge branch 'master' into export

Resources/config/doctrine/Activity.orm.yml

@@ -16,13 +16,14 @@ Chill\ActivityBundle\Entity\Activity:
             type: text
         attendee:
             type: boolean
+    manyToMany:
+        reasons:
+            targetEntity: Chill\ActivityBundle\Entity\ActivityReason
     manyToOne:
         user:
             targetEntity: Chill\MainBundle\Entity\User
         scope:
             targetEntity: Chill\MainBundle\Entity\Scope
-        reason:
-            targetEntity: Chill\ActivityBundle\Entity\ActivityReason
         type:
             targetEntity: Chill\ActivityBundle\Entity\ActivityType
         person:

Resources/config/services.yml

@@ -16,7 +16,8 @@ services:
     chill.activity.form.type.translatableactivitytype:
         class: Chill\ActivityBundle\Form\Type\TranslatableActivityType
         arguments:
-            - "@request_stack"
+            - "@chill.main.helper.translatable_string"
+            - "@chill_activity.repository.activity_type"
         tags:
             - { name: form.type, alias: translatable_activity_type }
             
@@ -27,6 +28,7 @@ services:
             - "@chill.main.security.authorization.helper"
             - "@doctrine.orm.entity_manager"
             - "@chill.main.helper.translatable_string"
+            - "%chill_activity.form.time_duration%"
         tags:
             - { name: form.type, alias: chill_activitybundle_activity }
             

Resources/config/services/repositories.yml

@@ -0,0 +1,6 @@
+services:
+    chill_activity.repository.activity_type:
+        class: Doctrine\ORM\EntityRepository
+        factory: ['@doctrine.orm.entity_manager', getRepository]
+        arguments:
+            - 'Chill\ActivityBundle\Entity\ActivityType'