-
Notifications
You must be signed in to change notification settings - Fork 38
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow Notifier component to limit amount of notifications to return. #8
Open
akkaweb
wants to merge
9
commits into
bakkerij:master
Choose a base branch
from
akkaweb:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
afafe4f
Updating README.md to reflect new changes to the Component
akkaweb 413dd9e
Allow notifications limit to be passed to getNotifications()
akkaweb 1d447dc
Update NotifierComponent.php
akkaweb 3089569
Update NotifierComponentTest.php
akkaweb 497c8b6
Update NotifierComponent.php
akkaweb 2480649
Update README.md
akkaweb 15f325c
Update NotifierComponentTest.php
akkaweb dc0b243
Update NotifierComponent.php
akkaweb 181ad20
Update NotifierComponent.php
akkaweb File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,6 +12,7 @@ | |
* @since 1.0 | ||
* @license http://www.opensource.org/licenses/mit-license.php MIT License | ||
*/ | ||
|
||
namespace Notifier\Controller\Component; | ||
|
||
use Cake\Controller\Component; | ||
|
@@ -88,12 +89,17 @@ public function setController($controller) | |
* | ||
* // get all read notifications | ||
* $this->Notifier->getNotifications(1, false); | ||
* | ||
* // get 4 latest unread notifications | ||
* $options = ['limit' => 4]; | ||
* $this->Notifier->getNotifications(1, true, $options); | ||
* ``` | ||
* @param int|null $userId Id of the user. | ||
* @param bool|null $state The state of notifications: `true` for unread, `false` for read, `null` for all. | ||
* @param array|empty $options Currently supports 'limit', which limits returned notifications | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
* @return array | ||
*/ | ||
public function getNotifications($userId = null, $state = null) | ||
public function getNotifications($userId = null, $state = null, $options = []) | ||
{ | ||
if (!$userId) { | ||
$userId = $this->Controller->Auth->user('id'); | ||
|
@@ -106,6 +112,10 @@ public function getNotifications($userId = null, $state = null) | |
if (!is_null($state)) { | ||
$query->where(['Notifications.state' => $state]); | ||
} | ||
|
||
if (!empty($options['limit'])) { | ||
$query->limit($options['limit']); | ||
} | ||
|
||
return $query->toArray(); | ||
} | ||
|
@@ -179,7 +189,6 @@ public function markAsRead($notificationId = null, $user = null) | |
$query = $model->find('all')->where([ | ||
'user_id' => $user, | ||
'id' => $notificationId | ||
|
||
]); | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I dont think that change was valid :)