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

Fix issue with notifications and projects that allow everybody

This commit is contained in:
Frédéric Guillot 2014-11-01 16:38:14 -04:00
parent d97e1bd4cf
commit d040a6c5f6
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Model/Notification.php
View File

@ -35,6 +35,17 @@ class Notification extends Base
*/
public function getUsersWithNotification($project_id, array $exclude_users = array())
{
if ($this->projectPermission->isEverybodyAllowed($project_id)) {
return $this->db
->table(User::TABLE)
->columns(User::TABLE.'.id', User::TABLE.'.username', User::TABLE.'.name', User::TABLE.'.email')
->eq('notifications_enabled', '1')
->neq('email', '')
->notin(User::TABLE.'.id', $exclude_users)
->findAll();
}
return $this->db
->table(ProjectPermission::TABLE)
->columns(User::TABLE.'.id', User::TABLE.'.username', User::TABLE.'.name', User::TABLE.'.email')

13
tests/units/NotificationTest.php
View File

@ -58,6 +58,7 @@ class NotificationTest extends Base
$this->assertEquals(1, $p->create(array('name' => 'UnitTest1')));
$this->assertEquals(2, $p->create(array('name' => 'UnitTest2')));
$this->assertEquals(3, $p->create(array('name' => 'UnitTest3', 'is_everybody_allowed' => 1)));
// Email + Notifications enabled
$this->assertTrue($u->create(array('username' => 'user1', 'email' => 'user1@here', 'notifications_enabled' => 1)));
@ -116,5 +117,17 @@ class NotificationTest extends Base
$this->assertNotEmpty($users);
$this->assertEquals(1, count($users));
$this->assertEquals('user3@here', $users[0]['email']);
// Project #3 allow everybody
$users = $n->getUsersList(3);
$this->assertNotEmpty($users);
$this->assertEquals(1, count($users));
$this->assertEquals('user1@here', $users[0]['email']);
$users = $n->getUsersWithNotification(3);
$this->assertNotEmpty($users);
$this->assertEquals(2, count($users));
$this->assertEquals('user1@here', $users[0]['email']);
$this->assertEquals('user3@here', $users[1]['email']);
}
}