AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move notifications outside of dashboard

Browse Source
This commit is contained in:
Frederic Guillot
2017-03-11 19:01:40 -05:00
parent bb9e791657
commit cfd3000d83
34 changed files with 134 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Controller/DashboardController.php
View File

@@ -106,20 +106,4 @@ class DashboardController extends BaseController
'user' => $user,
)));
}
/**
* My notifications
*
* @access public
*/
public function notifications()
{
$user = $this->getUser();
$this->response->html($this->helper->layout->dashboard('dashboard/notifications', array(
'title' => t('Notifications for %s', $this->helper->user->getFullname($user)),
'notifications' => $this->userUnreadNotificationModel->getAll($user['id']),
'user' => $user,
)));
}
}

29
app/Controller/WebNotificationController.php
View File

@@ -10,6 +10,23 @@ namespace Kanboard\Controller;
*/
class WebNotificationController extends BaseController
{
/**
* My notifications
*
* @access public
*/
public function show()
{
$user = $this->getUser();
$notifications = $this->userUnreadNotificationModel->getAll($user['id']);
$this->response->html($this->template->render('web_notification/show', array(
'notifications' => $notifications,
'nb_notifications' => count($notifications),
'user' => $user,
)));
}
/**
* Mark all notifications as read
*
@@ -17,10 +34,9 @@ class WebNotificationController extends BaseController
*/
public function flush()
{
$user_id = $this->getUserId();
$this->userUnreadNotificationModel->markAllAsRead($user_id);
$this->response->redirect($this->helper->url->to('DashboardController', 'notifications', array('user_id' => $user_id)));
$userId = $this->getUserId();
$this->userUnreadNotificationModel->markAllAsRead($userId);
$this->show();
}
/**
@@ -32,9 +48,8 @@ class WebNotificationController extends BaseController
{
$user_id = $this->getUserId();
$notification_id = $this->request->getIntegerParam('notification_id');
$this->userUnreadNotificationModel->markAsRead($user_id, $notification_id);
$this->response->redirect($this->helper->url->to('DashboardController', 'notifications', array('user_id' => $user_id)));
$this->show();
}
/**
@@ -49,7 +64,7 @@ class WebNotificationController extends BaseController
$this->userUnreadNotificationModel->markAsRead($user_id, $notification_id);
if (empty($notification)) {
$this->response->redirect($this->helper->url->to('DashboardController', 'notifications', array('user_id' => $user_id)));
$this->show();
} elseif ($this->helper->text->contains($notification['event_name'], 'comment')) {
$this->response->redirect($this->helper->url->to(
'TaskViewController',