partkeepr

commit 70fffef00f67d452086c70d497c62de07023c602
parent e9c944dfc97ee5893a9962c8bd491d6fa6a68806
Author: Felicitus <felicitus@felicitus.org>
Date:   Fri, 24 Jul 2015 23:22:08 +0200

Merge branch 'sf2migration' of github.com:partkeepr/PartKeepr into sf2migration

Diffstat:
M
src/PartKeepr/FootprintBundle/Entity/Footprint.php
 | 
2
+-
M
src/PartKeepr/StorageLocationBundle/Entity/StorageLocation.php
 | 
3
++-

2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/PartKeepr/FootprintBundle/Entity/Footprint.php b/src/PartKeepr/FootprintBundle/Entity/Footprint.php
@@ -38,7 +38,7 @@ class Footprint extends BaseEntity
     /**
      * The category of the footprint
      *
-     * @ORM\ManyToOne(targetEntity="FootprintCategory")
+     * @ORM\ManyToOne(targetEntity="FootprintCategory", inversedBy="footprints")
      * @Groups({"default"})
      *
      * @var FootprintCategory
diff --git a/src/PartKeepr/StorageLocationBundle/Entity/StorageLocation.php b/src/PartKeepr/StorageLocationBundle/Entity/StorageLocation.php
@@ -30,7 +30,8 @@ class StorageLocation extends BaseEntity
     /**
      * The category of the footprint
      *
-     * @ORM\ManyToOne(targetEntity="PartKeepr\StorageLocationBundle\Entity\StorageLocationCategory")
+     * @ORM\ManyToOne(targetEntity="PartKeepr\StorageLocationBundle\Entity\StorageLocationCategory",
+     *                inversedBy="storageLocations")
      * @Groups({"default"})
      *
      * @var StorageLocationCategory