diff options
Diffstat (limited to 'src/Wallabag/UserBundle')
-rw-r--r-- | src/Wallabag/UserBundle/Entity/Group.php | 20 | ||||
-rw-r--r-- | src/Wallabag/UserBundle/Entity/User.php | 2 | ||||
-rw-r--r-- | src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig | 1 |
3 files changed, 2 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 | |||
3 | namespace Wallabag\UserBundle\Entity; | ||
4 | |||
5 | use FOS\UserBundle\Model\Group as BaseGroup; | ||
6 | use Doctrine\ORM\Mapping as ORM; | ||
7 | |||
8 | /** | ||
9 | * @ORM\Entity | ||
10 | * @ORM\Table(name="`group`") | ||
11 | */ | ||
12 | class 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")} |
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig index 15002632..9d5abcaf 100644 --- a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig | |||
@@ -30,6 +30,7 @@ | |||
30 | {{ form_rest(searchForm) }} | 30 | {{ form_rest(searchForm) }} |
31 | </form> | 31 | </form> |
32 | </div> | 32 | </div> |
33 | |||
33 | </div> | 34 | </div> |
34 | 35 | ||
35 | <table class="bordered"> | 36 | <table class="bordered"> |