mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-29 16:55:05 +02:00
#7495 fixed report name 2
This commit is contained in:
parent
88c42d953f
commit
0a79014480
@ -3370,7 +3370,7 @@ $buttons['view'] = [
|
|||||||
$buttons[$activeTab]['active'] = true;
|
$buttons[$activeTab]['active'] = true;
|
||||||
|
|
||||||
if ($idReport != 0) {
|
if ($idReport != 0) {
|
||||||
$textReportName = $report['name'];
|
$textReportName = (empty($reportName) === false) ? $reportName : $report['name'];
|
||||||
} else {
|
} else {
|
||||||
$temp = $buttons['main'];
|
$temp = $buttons['main'];
|
||||||
$buttons = null;
|
$buttons = null;
|
||||||
|
@ -2302,8 +2302,7 @@ function reporting_agents_inventory($report, $content)
|
|||||||
$search_sql = '';
|
$search_sql = '';
|
||||||
|
|
||||||
if ($es_custom_fields != '') {
|
if ($es_custom_fields != '') {
|
||||||
// Search custom field.
|
$search_sql .= ' AND id_os = '.$es_custom_fields;
|
||||||
// $search_sql .= ' AND id_os = '.$es_custom_fields;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (in_array('0', $es_os_filter) === false) {
|
if (in_array('0', $es_os_filter) === false) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user