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

Ent 7155 bug edicion tickets integria

This commit is contained in:
Luis 2021-05-10 09:17:14 +00:00 committed by Daniel Rodriguez
parent 321fc8aa05
commit a94c70551d
2 changed files with 42 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/include/functions_html.php
View File

@ -4991,6 +4991,9 @@ function html_print_input_multicheck(array $data):string
* @param string $default The default value to show in the ajax control. * @param string $default The default value to show in the ajax control.
* @param boolean $return If it is true return a string with the output instead to echo the output. * @param boolean $return If it is true return a string with the output instead to echo the output.
* @param string $size Size. * @param string $size Size.
* @param boolean $disable Disable the button (optional, button enabled by default).
* @param boolean $required Attribute required.
* @param string $class Text inpunt class.
* *
* @return mixed If the $return is true, return the output as string. * @return mixed If the $return is true, return the output as string.
*/ */
@ -5000,7 +5003,8 @@ function html_print_autocomplete_users_from_integria(
$return=false, $return=false,
$size='30', $size='30',
$disable=false, $disable=false,
$required=false $required=false,
$class=null
) { ) {
global $config; global $config;
@ -5012,6 +5016,10 @@ function html_print_autocomplete_users_from_integria(
$attrs['required'] = 'required'; $attrs['required'] = 'required';
} }
if (empty($class) === false) {
$attrs['class'] = $class;
}
html_print_input_text_extended( html_print_input_text_extended(
$name, $name,
$default, $default,

14
pandora_console/operation/incidents/configure_integriaims_incident.php
View File

@ -163,8 +163,7 @@ $table->colspan[3][0] = 3;
$help_macros = isset($_GET['from_event']) ? ui_print_help_icon('response_macros', true) : ''; $help_macros = isset($_GET['from_event']) ? ui_print_help_icon('response_macros', true) : '';
if (isset($_GET['from_event'])) { if ($update) {
if ($update) {
$input_value_title = $incident_details[3]; $input_value_title = $incident_details[3];
$input_value_type = $incident_details[17]; $input_value_type = $incident_details[17];
$input_value_status = $incident_details[6]; $input_value_status = $incident_details[6];
@ -172,7 +171,7 @@ if (isset($_GET['from_event'])) {
$input_value_criticity = $incident_details[7]; $input_value_criticity = $incident_details[7];
$input_value_owner = $incident_details[5]; $input_value_owner = $incident_details[5];
$input_value_content = $incident_details[4]; $input_value_content = $incident_details[4];
} else if (isset($_GET['from_event'])) { } else if (isset($_GET['from_event'])) {
$input_value_title = $config['cr_incident_title']; $input_value_title = $config['cr_incident_title'];
$input_value_type = $config['cr_incident_type']; $input_value_type = $config['cr_incident_type'];
$input_value_status = $config['cr_incident_status']; $input_value_status = $config['cr_incident_status'];
@ -180,7 +179,7 @@ if (isset($_GET['from_event'])) {
$input_value_criticity = $config['cr_default_criticity']; $input_value_criticity = $config['cr_default_criticity'];
$input_value_owner = $config['cr_default_owner']; $input_value_owner = $config['cr_default_owner'];
$input_value_content = $config['cr_incident_content']; $input_value_content = $config['cr_incident_content'];
} else { } else {
$input_value_title = ''; $input_value_title = '';
$input_value_type = ''; $input_value_type = '';
$input_value_status = ''; $input_value_status = '';
@ -188,7 +187,6 @@ if (isset($_GET['from_event'])) {
$input_value_criticity = ''; $input_value_criticity = '';
$input_value_owner = ''; $input_value_owner = '';
$input_value_content = ''; $input_value_content = '';
}
} }
$table->data[0][0] = '<div class="label_select"><p class="input_label">'.__('Title').':&nbsp'.$help_macros.'</p>'; $table->data[0][0] = '<div class="label_select"><p class="input_label">'.__('Title').':&nbsp'.$help_macros.'</p>';
@ -290,7 +288,11 @@ $table->data[2][2] = '<div class="label_select"><p class="input_label">'.__('Own
$table->data[2][2] .= '<div class="label_select_parent">'.html_print_autocomplete_users_from_integria( $table->data[2][2] .= '<div class="label_select_parent">'.html_print_autocomplete_users_from_integria(
'owner', 'owner',
$input_value_owner, $input_value_owner,
true true,
'30',
false,
false,
'w100p'
).'</div>'; ).'</div>';
$table->data[3][0] = '<div class="label_select"><p class="input_label">'.__('Description').':&nbsp'.$help_macros.'</p>'; $table->data[3][0] = '<div class="label_select"><p class="input_label">'.__('Description').':&nbsp'.$help_macros.'</p>';