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

fixed minor error custom field view 

Former-commit-id: deaa026e2f44273657ff8d76c4f4e212b46c04fe
This commit is contained in:
daniel 2018-12-10 13:22:51 +01:00
parent 1fdba79162
commit ffb6b47106
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/include/ajax/custom_fields.php
View File

@ -484,21 +484,23 @@ if($append_tab_filter){
$table->id = 'save_filter_form';
$table->width = '100%';
$table->class = 'databox';
$table->rowspan = array();
if($filters['id'] == 'extended_create_filter'){
echo "<div id='msg_error_create'></div>";
$table->data[0][0] = __('Filter name');
$table->data[0][1] = html_print_input_text('id_name', '', '', 15, 255, true);
$table->data[0][2] = __('Group');
$table->data[0][3] = html_print_select_groups(
$table->data[1][0] = __('Group');
$table->data[1][1] = html_print_select_groups(
$config['id_user'], 'AR', true, 'group_search_cr',
0, '', '', '0', true, false,
false, '', false, '', false, false,
false, '', false, 'width:180px;', false, false,
'id_grupo', false
);
$table->data[0][4] = html_print_submit_button (__('Create filter'), 'create_filter', false, 'class="sub upd"', true);
$table->rowspan[0][2] = 2;
$table->data[0][2] = html_print_submit_button (__('Create filter'), 'create_filter', false, 'class="sub upd"', true);
}
else{
echo "<div id='msg_error_update'></div>";
@ -516,7 +518,7 @@ if($append_tab_filter){
$table->data[1][1] = html_print_select_groups(
$config['id_user'], 'AR', true, 'group_search_up',
$group, '', '', '0', true, false,
false, '', false, '', false, false,
false, '', false, 'width:180px;', false, false,
'id_grupo', false
);

2
pandora_console/include/functions_reporting.php
View File

@ -10361,7 +10361,7 @@ function reporting_label_macro ($item, $label) {
case 'MTTR':
case 'automatic_graph':
if (preg_match("/_agent_/", $label)) {
if (count($item['agents']) > 1) {
if (isset($item['agents']) && count($item['agents']) > 1) {
$agent_name = count($item['agents']) . __(' agents');
}
else {