tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

#8365 Fixed ncm reports of html type

Browse Source
This commit is contained in:
Jorge Rincon 2023-11-07 15:22:22 +01:00
parent 366018b0e9
commit 2d7895b39b
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -8146,10 +8146,17 @@ function filterNcmAgentChange() {
}, },
success: function(data) { success: function(data) {
$("#agent_ncm").empty(); $("#agent_ncm").empty();
var optionAny = $("<option></option>")
.attr("value",0)
.html("Any");
// Add any option.
$("#agent_ncm").append(optionAny);
data.map(item => { data.map(item => {
var option = $("<option></option>") var option = $("<option></option>")
.attr("value", item.id_agent) .attr("value", item.id_agent)
.html(item.alias); .html(item.alias);
// Add agents options.
$("#agent_ncm").append(option); $("#agent_ncm").append(option);
}); });
}, },

7
pandora_console/include/functions_reporting_html.php
View File

@ -7437,6 +7437,7 @@ function reporting_html_ncm_backups($table, $item, $pdf=0)
ui_require_javascript_file('highlight.min'); ui_require_javascript_file('highlight.min');
ui_require_javascript_file('highlightjs-line-numbers.min'); ui_require_javascript_file('highlightjs-line-numbers.min');
ui_require_javascript_file('languages/plaintext.min'); ui_require_javascript_file('languages/plaintext.min');
ui_require_javascript_file('jquery', ENTERPRISE_DIR.'/include/javascript/');
ui_require_javascript_file('functions_ncm', ENTERPRISE_DIR.'/include/javascript/'); ui_require_javascript_file('functions_ncm', ENTERPRISE_DIR.'/include/javascript/');
// Create table diff. // Create table diff.
@ -7448,6 +7449,8 @@ function reporting_html_ncm_backups($table, $item, $pdf=0)
$table_ncm->head = []; $table_ncm->head = [];
$table_ncm->head[0] = __('Date'); $table_ncm->head[0] = __('Date');
$table_ncm->head[1] = __('Diff'); $table_ncm->head[1] = __('Diff');
$table_ncm->caption = $item['caption'];
$table_ncm->id = 'ncm_backups';
$table_ncm->data = []; $table_ncm->data = [];
@ -7459,7 +7462,9 @@ function reporting_html_ncm_backups($table, $item, $pdf=0)
]; ];
} }
return $table->data[] = html_print_table( $table->colspan['ncm_backups']['cell'] = 3;
$table->cellstyle['ncm_backups']['cell'] = 'text-align: left;';
$table->data['ncm_backups']['cell'] = html_print_table(
$table_ncm, $table_ncm,
true true
); );

4
pandora_console/include/styles/pandora.css
View File

@ -12798,3 +12798,7 @@ tr.shown td.details-control {
position: relative; position: relative;
top: -92px; top: -92px;
} }
#ncm_backups > caption > h4 {
color: black;
}