AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #451 from wrongecho/ticket-modal 

Don't show archived users for ticket filters/assignment
This commit is contained in:
Johnny 2022-04-29 11:03:34 -04:00 committed by GitHub
parent eee7c0b204 bc1426ba18
commit 496a9a6e88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ticket_edit_modal.php
View File

@ -21,7 +21,7 @@
<option value="0">Not Assigned</option>
<?php
$sql_assign_to_select = mysqli_query($mysqli,"SELECT * FROM users, user_companies WHERE users.user_id = user_companies.user_id AND user_companies.company_id = $session_company_id ORDER BY user_name ASC");
$sql_assign_to_select = mysqli_query($mysqli,"SELECT * FROM users, user_companies WHERE users.user_id = user_companies.user_id AND user_companies.company_id = $session_company_id AND user_archived_at IS NULL ORDER BY user_name ASC");
while($row = mysqli_fetch_array($sql_assign_to_select)){
$user_id = $row['user_id'];
$user_name = $row['user_name'];

2
tickets.php
View File

@ -279,7 +279,7 @@ $user_active_assigned_tickets = $row['total_tickets_assigned'];
<option value="unassigned"<?php if($ticket_assigned_filter == "0"){echo "selected";}?> >Unassigned</option>
<?php
$sql_assign_to = mysqli_query($mysqli,"SELECT * FROM users ORDER BY user_name ASC");
$sql_assign_to = mysqli_query($mysqli,"SELECT * FROM users WHERE user_archived_at IS NULL ORDER BY user_name ASC");
while($row = mysqli_fetch_array($sql_assign_to)){
$user_id = $row['user_id'];
$user_name = $row['user_name'];