tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add name templates wizard and sample mode with macros ticket: 3937

This commit is contained in:
daniel 2016-10-04 11:31:42 +02:00
parent 744409c05f
commit 2555f00b96
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -637,7 +637,7 @@ $class = 'databox filters';
<tr id="row_name" style="" class="datos">
<td style="font-weight:bold;">
<?php echo __('Name'); ?>
<?php echo __('Name') . ui_print_help_icon ('reports_label_field',true); ?>
</td>
<td style="">
<?php

21
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -900,10 +900,19 @@ switch ($action) {
case 'update':
$values = array();
$values['id_report'] = $idReport;
$values['name'] = (string) get_parameter('name');
//$values['name'] = (string) get_parameter('name');
$values['description'] = get_parameter('description');
$values['type'] = get_parameter('type', null);
$label = get_parameter('label', '');
//Add macros name
$items_label = array();
$items_label['type'] = get_parameter('type');
$items_label['id_agent'] = get_parameter('id_agent');
$items_label['id_agent_module'] = get_parameter('id_agent_module');
$name_it = (string) get_parameter('name');
$values['name'] = reporting_label_macro($items_label, $name_it);
// Added support for projection graphs, prediction date and SLA reports
// 'top_n_value','top_n' and 'text' fields will be reused for these types of report
switch ($values['type']) {
@ -1198,10 +1207,18 @@ switch ($action) {
$values = array();
$values['id_report'] = $idReport;
$values['type'] = get_parameter('type', null);
$values['name'] = (string) get_parameter('name');
//$values['name'] = (string) get_parameter('name');
$values['description'] = get_parameter('description');
$label = get_parameter('label', '');
//Add macros name
$items_label = array();
$items_label['type'] = get_parameter('type');
$items_label['id_agent'] = get_parameter('id_agent');
$items_label['id_agent_module'] = get_parameter('id_agent_module');
$name_it = (string) get_parameter('name');
$values['name'] = reporting_label_macro($items_label, $name_it);
// Support for projection graph, prediction date and SLA reports
// 'top_n_value', 'top_n' and 'text' fields will be reused for these types of report
switch ($values['type']) {