SocialIssues became editable via admin

src/Bundle/ChillPersonBundle/config/routes.yaml

@@ -136,6 +136,16 @@ chill_person_maritalstatus_admin:
                 order: 120
                 label: 'person_admin.marital status'
 
+chill_person_socialissue_admin:
+    path:     /{_locale}/admin/social-issue
+    controller: cscrud_social_issue_controller:index
+    options:
+        menus:
+            admin_person:
+                order: 150
+                label: 'person_admin.social_issue'
+
+
 chill_person_controllers:
     resource: "@ChillPersonBundle/Controller"
     type: annotation

src/Bundle/ChillPersonBundle/config/services.yaml

@@ -2,12 +2,9 @@ parameters:
 #    cl_chill_person.example.class: Chill\PersonBundle\Example
 
 services:
-<<<<<<< HEAD
     _defaults:
         autowire: true
         autoconfigure: true
-=======
->>>>>>> Removing spaces at the end of line
 
     Chill\PersonBundle\Service\:
         resource: '../Service/'

src/Bundle/ChillPersonBundle/config/services/form.yaml

@@ -32,7 +32,7 @@ services:
     chill.person.form.type.pick_person:
         class: Chill\PersonBundle\Form\Type\PickPersonType
         arguments:
-            - "@chill.person.repository.person"
+            - '@Chill\PersonBundle\Repository\PersonRepository'
             - "@security.token_storage"
             - "@chill.main.security.authorization.helper"
             - '@Symfony\Component\Routing\Generator\UrlGeneratorInterface'
@@ -53,3 +53,9 @@ services:
             $em: '@Doctrine\ORM\EntityManagerInterface'
         tags:
             - { name: form.type }
+
+    Chill\PersonBundle\Form\SocialWork\SocialIssueType:
+        arguments:
+            $translatableStringHelper: '@chill.main.helper.translatable_string'
+        tags:
+            - { name: form.type }