Merge branch 'master' into export

Resources/config/doctrine/Person.orm.yml

@@ -72,4 +72,10 @@ Chill\PersonBundle\Entity\Person:
                 inverseJoinColumns:
                     language_id:
                         referencedColumnName: id
+        addresses:
+            targetEntity: Chill\MainBundle\Entity\Address
+            orderBy: { 'validFrom': 'DESC' }
+            joinTable:
+                name: chill_person_persons_to_addresses
+            cascade: [persist, remove, merge, detach]
     lifecycleCallbacks: {  }

Resources/config/routing.yml

@@ -69,6 +69,27 @@ chill_person_accompanying_period_close:
 chill_person_accompanying_period_open:
     path: /{_locale}/person/{person_id}/accompanying-period/open
     defaults: { _controller: ChillPersonBundle:AccompanyingPeriod:open }
+    
+chill_person_address_list:
+    path: /{_locale}/person/{person_id}/address/list
+    defaults: { _controller: ChillPersonBundle:PersonAddress:list }
+
+chill_person_address_create:
+    path: /{_locale}/person/{person_id}/address/create
+    defaults: { _controller: ChillPersonBundle:PersonAddress:create }
+    methods: [POST]
+    
+chill_person_address_new:
+    path: /{_locale}/person/{person_id}/address/new
+    defaults: { _controller: ChillPersonBundle:PersonAddress:new }
+    
+chill_person_address_edit:
+    path: /{_locale}/person/{person_id}/address/{address_id}/edit
+    defaults: { _controller: ChillPersonBundle:PersonAddress:edit }
+    
+chill_person_address_update:
+    path: /{_locale}/person/{person_id}/address/{address_id}/update
+    defaults: { _controller: ChillPersonBundle:PersonAddress:update }
 
 chill_person_export:
     path: /{_locale}/person/export/

Resources/config/services.yml

@@ -1,7 +1,14 @@
 parameters:
 #    cl_chill_person.example.class: Chill\PersonBundle\Example
 
-services:         
+services:   
+    chill.person.form.person_creation:
+        class: Chill\PersonBundle\Form\PersonType
+        arguments:
+            - %chill_person.person_fields%
+        tags:
+            - { name: form.type }
+    
     chill.person.accompanying_period_closing_motive:
         class: Chill\PersonBundle\Form\Type\ClosingMotiveType
         scope: request
@@ -93,4 +100,19 @@ services:
         arguments:
             - "@translator"
         tags:
-            - { name: chill.export_aggregator, alias: person_gender_aggregator }
+            - { name: chill.export_aggregator, alias: person_gender_aggregator }
+
+    chill.person.form.type.pick_person:
+        class: Chill\PersonBundle\Form\Type\PickPersonType
+        arguments:
+            - "@chill.person.repository.person"
+            - "@security.token_storage"
+            - "@chill.main.security.authorization.helper"
+        tags:
+            - { name: form.type }
+            
+    chill.person.repository.person:
+        class: Chill\PersonBundle\Entity\PersonRepository
+        factory: ['@doctrine.orm.entity_manager', getRepository]
+        arguments:
+            - 'Chill\PersonBundle\Entity\Person'