Skip to content

Commit

Permalink
[user_accounts] Remove DDC restriction for pending accounts in dashbo…
Browse files Browse the repository at this point in the history
…ard (aces#7054)

Remove the restriction that DDC users are not included in pending account approval in the dashboard widget.

    Resolves aces#6962
  • Loading branch information
CamilleBeau authored and AlexandraLivadas committed Jun 29, 2021
1 parent 6d7b4a0 commit fb74e4c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion modules/dashboard/test/DashboardTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ public function testPendingUser()
$this->safeGet($this->url . '/dashboard/');
$this->_testMytaskPanelAndLink(
".pending-accounts",
"1",
"2",
"- User Accounts"
);
$this->resetPermissions();
Expand Down
3 changes: 1 addition & 2 deletions modules/user_accounts/php/module.class.inc
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ class Module extends \Module
$DB,
"SELECT COUNT(DISTINCT users.UserID) FROM users
LEFT JOIN user_psc_rel as upr ON (upr.UserID=users.ID)
WHERE users.Pending_approval='Y'
AND (upr.CenterID <> 1 OR upr.CenterID IS NULL)",
WHERE users.Pending_approval='Y'",
'user_accounts_multisite',
'upr.CenterID',
$baseURL . "/user_accounts/?pendingApproval=Y",
Expand Down

0 comments on commit fb74e4c

Please sign in to comment.