KingOfDog.de/old
Archived
1
0
Fork 0
Code Releases Activity

Fix notifications

Browse Source
This commit is contained in:
Marcel
2018-10-17 16:27:56 +02:00
parent 334aa22362
commit 6b9d8042fe
6 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/controllers/Main.php
View File

@@ -132,9 +132,12 @@
exit;
}
$count = (int) $this->input->post('count');
$offset = (int) $this->input->post('offset');
$returnData = ['status' => 'success', 'notifications' => []];
$notifications = $this->NotificationModel->getUserNotifications($_SESSION['user']['ID']);
$notifications = $this->NotificationModel->getUserNotifications($_SESSION['user']['ID'], $count, $count * $offset);
$returnData['notifications'] = $notifications;
echo json_encode($returnData);

4
application/models/NotificationModel.php
View File

@@ -62,7 +62,6 @@
}
return $result;
// Mark as read
}
private function add(Notification $notification) {
@@ -115,6 +114,9 @@
case 'admin.feedback':
$items[] = new \Notification\Admin\NewFeedbackNotification($item);
break;
case 'admin.reportedPost':
$items[] = new \Notification\Users\PostReportNotification($item);
break;
}
}
$groups[] = new NotificationGroup($items, $group['count']);

2
application/models/notifications/NotificationGroup.php
View File

@@ -23,7 +23,7 @@
public function __get($attribute)
{
return $this->notifications[0]->{$attribute};
return !empty($this->notifications) ? $this->notifications[0]->{$attribute} : null;
}
public function __call($name, $arguments)

4
application/views/header.php
View File

@@ -90,7 +90,9 @@
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="notificationMenuButton" id="notificationMenu">
<div class="list-group list-group-flush">
<div class="text-center">
<i class="fa fa-cog fa-spin fa-4x my-4"></i>
</div>
</div>
</div>
</div>