Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[issue_tracker] Do not display inactive users in issue form #8841

Merged
merged 5 commits into from
Nov 7, 2023
Merged

[issue_tracker] Do not display inactive users in issue form #8841

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fed4ab5
issue_tracker - remove inactive users from drop down
charlottesce Jul 19, 2023
3f8a046
issue_tracker - add Pending_approval=N
charlottesce Aug 10, 2023
77dcce8
issue_tracker - add current assignees & watchers in dropdown
charlottesce Aug 10, 2023
5e61a91
issue_tracker - add breadcrumbs edit class
charlottesce Aug 10, 2023
4fb88a4
issue_tracker - phpcbf
charlottesce Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions modules/issue_tracker/php/edit.class.inc
View file
Open in desktop
Expand Up @@ -66,7 +66,7 @@ class Edit extends \NDB_Page implements ETagCalculator
$inactive_users = [];
if ($user->hasPermission('access_all_profiles')) {
$assignee_expanded = $db->pselect(
"SELECT Real_name, UserID FROM users",
"SELECT Real_name, UserID FROM users WHERE Active='Y'",
charlottesce marked this conversation as resolved.
Show resolved Hide resolved
[]
);

Expand All @@ -84,7 +84,8 @@ class Edit extends \NDB_Page implements ETagCalculator
$assignee_expanded = $db->pselect(
"SELECT DISTINCT u.Real_name, u.UserID FROM users u
LEFT JOIN user_psc_rel upr ON (upr.UserID=u.ID)
WHERE FIND_IN_SET(upr.CenterID,:CenterID) OR (upr.CenterID=:DCC)",
WHERE FIND_IN_SET(upr.CenterID,:CenterID) OR (upr.CenterID=:DCC)
AND Active='Y'",
[
'CenterID' => $CenterID,
'DCC' => $DCCID,
Expand Down Expand Up @@ -113,7 +114,7 @@ class Edit extends \NDB_Page implements ETagCalculator

$otherWatchers = [];
$potential_watchers_expanded = $db->pselect(
"SELECT Real_name, UserID FROM users",
"SELECT Real_name, UserID FROM users WHERE Active='Y'",
[]
);
foreach ($potential_watchers_expanded as $w_row) {
Expand Down
4 changes: 2 additions & 2 deletions modules/issue_tracker/php/issue_tracker.class.inc
View file
Open in desktop
Expand Up @@ -115,7 +115,7 @@ class Issue_Tracker extends \NDB_Menu_Filter_Form
//reporters
$reporters = [];
$reporter_expanded = $db->pselect(
"SELECT u.UserID,
"SELECT DISTINCT u.UserID,
u.Real_name
FROM issues i
INNER JOIN users u
Expand All @@ -129,7 +129,7 @@ class Issue_Tracker extends \NDB_Menu_Filter_Form
//assignees
$assignees = [];
$assignee_expanded = $db->pselect(
"SELECT u.UserID,
"SELECT DISTINCT u.UserID,
u.Real_name
FROM issues i
INNER JOIN users u
Expand Down