mirror of https://github.com/itflow-org/itflow
Fix issue under client tickets listing where contact name would appear incorrectly
This commit is contained in:
parent
9449a87a1f
commit
29dd0f6dee
|
|
@ -125,21 +125,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
|
||||||
} else {
|
} else {
|
||||||
$ticket_assigned_to_display = nullable_htmlentities($row['user_name']);
|
$ticket_assigned_to_display = nullable_htmlentities($row['user_name']);
|
||||||
}
|
}
|
||||||
$contact_id = intval($row['contact_id']);
|
$contact_id = intval($row['ticket_contact_id']);
|
||||||
$contact_name = nullable_htmlentities($row['contact_name']);
|
$contact_name = nullable_htmlentities($row['contact_name']);
|
||||||
if (empty($contact_name)) {
|
|
||||||
$contact_display = "-";
|
|
||||||
} else {
|
|
||||||
$contact_display = "$contact_name<br><small class='text-secondary'>$contact_email</small>";
|
|
||||||
}
|
|
||||||
$contact_title = nullable_htmlentities($row['contact_title']);
|
$contact_title = nullable_htmlentities($row['contact_title']);
|
||||||
$contact_email = nullable_htmlentities($row['contact_email']);
|
$contact_email = nullable_htmlentities($row['contact_email']);
|
||||||
$contact_phone = formatPhoneNumber($row['contact_phone']);
|
$contact_phone = formatPhoneNumber($row['contact_phone']);
|
||||||
$contact_extension = nullable_htmlentities($row['contact_extension']);
|
$contact_extension = nullable_htmlentities($row['contact_extension']);
|
||||||
$contact_mobile = formatPhoneNumber($row['contact_mobile']);
|
$contact_mobile = formatPhoneNumber($row['contact_mobile']);
|
||||||
|
if (empty($contact_name)) {
|
||||||
$asset_id = intval($row['asset_id']);
|
$contact_display = "-";
|
||||||
$vendor_id = intval($row['vendor_id']);
|
} else {
|
||||||
|
$contact_display = "$contact_name<br><small class='text-secondary'>$contact_email</small>";
|
||||||
|
}
|
||||||
|
|
||||||
|
$asset_id = intval($row['ticket_asset_id']);
|
||||||
|
$vendor_id = intval($row['ticket_vendor_id']);
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -276,9 +276,9 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
|
||||||
$ticket_updated_at_display = $ticket_updated_at;
|
$ticket_updated_at_display = $ticket_updated_at;
|
||||||
}
|
}
|
||||||
$ticket_closed_at = nullable_htmlentities($row['ticket_closed_at']);
|
$ticket_closed_at = nullable_htmlentities($row['ticket_closed_at']);
|
||||||
$client_id = intval($row['client_id']);
|
$client_id = intval($row['ticket_client_id']);
|
||||||
$client_name = nullable_htmlentities($row['client_name']);
|
$client_name = nullable_htmlentities($row['client_name']);
|
||||||
$contact_id = intval($row['contact_id']);
|
$contact_id = intval($row['ticket_contact_id']);
|
||||||
$contact_name = nullable_htmlentities($row['contact_name']);
|
$contact_name = nullable_htmlentities($row['contact_name']);
|
||||||
$contact_title = nullable_htmlentities($row['contact_title']);
|
$contact_title = nullable_htmlentities($row['contact_title']);
|
||||||
$contact_email = nullable_htmlentities($row['contact_email']);
|
$contact_email = nullable_htmlentities($row['contact_email']);
|
||||||
|
|
@ -317,8 +317,8 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
|
||||||
$contact_display = "$contact_name<br><small class='text-secondary'>$contact_email</small>";
|
$contact_display = "$contact_name<br><small class='text-secondary'>$contact_email</small>";
|
||||||
}
|
}
|
||||||
|
|
||||||
$asset_id = intval($row['asset_id']);
|
$asset_id = intval($row['ticket_asset_id']);
|
||||||
$vendor_id = intval($row['vendor_id']);
|
$vendor_id = intval($row['ticket_vendor_id']);
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue