aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/UserBundle/Entity
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-11-02 21:53:07 +0100
committerThomas Citharel <tcit@tcit.fr>2017-06-23 09:18:39 +0200
commitb073a0b4efe26b0f1be3239d5b7cfef2fc59202c (patch)
treeefd49455960d842726e197ce83c71d201161fad8 /src/Wallabag/UserBundle/Entity
parentf1900b686eb8d7c41a940eede778234ac55086e1 (diff)
downloadwallabag-b073a0b4efe26b0f1be3239d5b7cfef2fc59202c.tar.gz
wallabag-b073a0b4efe26b0f1be3239d5b7cfef2fc59202c.tar.zst
wallabag-b073a0b4efe26b0f1be3239d5b7cfef2fc59202c.zip
Created GroupBundle
Diffstat (limited to 'src/Wallabag/UserBundle/Entity')
-rw-r--r--src/Wallabag/UserBundle/Entity/Group.php20
-rw-r--r--src/Wallabag/UserBundle/Entity/User.php2
2 files changed, 1 insertions, 21 deletions
diff --git a/src/Wallabag/UserBundle/Entity/Group.php b/src/Wallabag/UserBundle/Entity/Group.php
deleted file mode 100644
index 9145959d..00000000
--- a/src/Wallabag/UserBundle/Entity/Group.php
+++ /dev/null
@@ -1,20 +0,0 @@
1<?php
2
3namespace Wallabag\UserBundle\Entity;
4
5use FOS\UserBundle\Model\Group as BaseGroup;
6use Doctrine\ORM\Mapping as ORM;
7
8/**
9 * @ORM\Entity
10 * @ORM\Table(name="`group`")
11 */
12class Group extends BaseGroup
13{
14 /**
15 * @ORM\Id
16 * @ORM\Column(type="integer")
17 * @ORM\GeneratedValue(strategy="AUTO")
18 */
19 protected $id;
20}
diff --git a/src/Wallabag/UserBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php
index 781f7b03..7da0d1d5 100644
--- a/src/Wallabag/UserBundle/Entity/User.php
+++ b/src/Wallabag/UserBundle/Entity/User.php
@@ -98,7 +98,7 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf
98 private $authCode; 98 private $authCode;
99 99
100 /** 100 /**
101 * @ORM\ManyToMany(targetEntity="Wallabag\UserBundle\Entity\Group") 101 * @ORM\ManyToMany(targetEntity="Wallabag\GroupBundle\Entity\Group")
102 * @ORM\JoinTable(name="user_group", 102 * @ORM\JoinTable(name="user_group",
103 * joinColumns={@ORM\JoinColumn(name="user_id", referencedColumnName="id")}, 103 * joinColumns={@ORM\JoinColumn(name="user_id", referencedColumnName="id")},
104 * inverseJoinColumns={@ORM\JoinColumn(name="group_id", referencedColumnName="id")} 104 * inverseJoinColumns={@ORM\JoinColumn(name="group_id", referencedColumnName="id")}