diff options
Diffstat (limited to 'src/Wallabag/UserBundle')
-rw-r--r-- | src/Wallabag/UserBundle/Entity/User.php | 21 | ||||
-rw-r--r-- | src/Wallabag/UserBundle/Resources/views/manage.html.twig | 2 |
2 files changed, 22 insertions, 1 deletions
diff --git a/src/Wallabag/UserBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php index aba76ca7..aed5c73e 100644 --- a/src/Wallabag/UserBundle/Entity/User.php +++ b/src/Wallabag/UserBundle/Entity/User.php | |||
@@ -88,6 +88,11 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf | |||
88 | protected $entries; | 88 | protected $entries; |
89 | 89 | ||
90 | /** | 90 | /** |
91 | * @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\Notification", mappedBy="user", cascade={"remove"}) | ||
92 | */ | ||
93 | protected $notifications; | ||
94 | |||
95 | /** | ||
91 | * @ORM\OneToOne(targetEntity="Wallabag\CoreBundle\Entity\Config", mappedBy="user", cascade={"remove"}) | 96 | * @ORM\OneToOne(targetEntity="Wallabag\CoreBundle\Entity\Config", mappedBy="user", cascade={"remove"}) |
92 | */ | 97 | */ |
93 | protected $config; | 98 | protected $config; |
@@ -312,4 +317,20 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf | |||
312 | return $this->clients->first(); | 317 | return $this->clients->first(); |
313 | } | 318 | } |
314 | } | 319 | } |
320 | |||
321 | /** | ||
322 | * @return ArrayCollection<NotificationInterface> | ||
323 | */ | ||
324 | public function getNotifications() | ||
325 | { | ||
326 | return $this->notifications; | ||
327 | } | ||
328 | |||
329 | /** | ||
330 | * @param ArrayCollection<NotificationInterface> $notifications | ||
331 | */ | ||
332 | public function setNotifications($notifications) | ||
333 | { | ||
334 | $this->notifications = $notifications; | ||
335 | } | ||
315 | } | 336 | } |
diff --git a/src/Wallabag/UserBundle/Resources/views/manage.html.twig b/src/Wallabag/UserBundle/Resources/views/manage.html.twig index c614c55f..10d8050c 100644 --- a/src/Wallabag/UserBundle/Resources/views/manage.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/manage.html.twig | |||
@@ -3,7 +3,7 @@ | |||
3 | {% block title %}{{ 'user.manage.page_title'|trans }}{% endblock %} | 3 | {% block title %}{{ 'user.manage.page_title'|trans }}{% endblock %} |
4 | 4 | ||
5 | {% block content %} | 5 | {% block content %} |
6 | 6 | {{ parent() }} | |
7 | <div class="row"> | 7 | <div class="row"> |
8 | <div class="col s12"> | 8 | <div class="col s12"> |
9 | <div class="card-panel"> | 9 | <div class="card-panel"> |