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

Do not show inactive users in group members dropdown

Browse Source
This commit is contained in:
Frédéric Guillot
2018-05-07 10:48:43 -07:00
parent 143e7bb987
commit cc17cb3207
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Model/GroupMemberModel.php
View File

@@ -60,6 +60,7 @@ class GroupMemberModel extends Base
return $this->db->table(UserModel::TABLE) return $this->db->table(UserModel::TABLE)
->notInSubquery('id', $subquery) ->notInSubquery('id', $subquery)
->eq('is_active', 1)
->findAll(); ->findAll();
} }

2
tests/units/Model/GroupMemberTest.php
View File

@@ -43,6 +43,8 @@ class GroupMemberTest extends Base
$this->assertEquals(3, $userModel->create(array('username' => 'user2'))); $this->assertEquals(3, $userModel->create(array('username' => 'user2')));
$this->assertEquals(4, $userModel->create(array('username' => 'user3'))); $this->assertEquals(4, $userModel->create(array('username' => 'user3')));
$this->assertEquals(5, $userModel->create(array('username' => 'user4'))); $this->assertEquals(5, $userModel->create(array('username' => 'user4')));
$this->assertEquals(6, $userModel->create(array('username' => 'user5')));
$this->assertTrue($userModel->disable(6));
$this->assertTrue($groupMemberModel->addUser(1, 1)); $this->assertTrue($groupMemberModel->addUser(1, 1));
$this->assertTrue($groupMemberModel->addUser(1, 2)); $this->assertTrue($groupMemberModel->addUser(1, 2));