Merge branch 'feat/push'

# Conflicts: # volume/www/website/www/app/config/fos_elastica.yml # volume/www/website/www/src/AppBundle/Entity/User.php # volume/www/website/www/web/assetic/main.dash.talent.js # volume/www/website/www/web/css/styles.css
2019-09-04 15:42:48 +02:00
parent 4c841aaafa b5791997d8
commit 995bb0b43e
3 changed files with 6 additions and 0 deletions
@@ -1,6 +1,7 @@
 fos_elastica:
    clients:
        default: { host: %elastic_host%, port: %elastic_port% }
+
    indexes:
        tags:
            types:
@@ -140,3 +141,4 @@ fos_elastica:
                        model: AppBundle\Entity\User
                        provider: ~
                        finder: ~
+
@@ -6,12 +6,15 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
 use FOS\UserBundle\Model\User as BaseUser;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
+
 use JMS\Serializer\Annotation\ExclusionPolicy;
 use JMS\Serializer\Annotation\Expose;
 use Hateoas\Configuration\Annotation as Hateoas;
 use JMS\Serializer\Annotation\Groups;
 use JMS\Serializer\Annotation\Type;

+use AppBundle\Utils\Traits\CareerJsonTrait;
+
 /**
 * @ORM\Entity(repositoryClass="AppBundle\Repository\UserRepository")
 * @ORM\Table(name="fos_user")