Merge branch 'ent-10899-consola-mete-entities-en-los-custom-fields-del-inventario' into 'develop'
Ent 10899 consola mete entities en los custom fields del inventario See merge request artica/pandorafms!5699
This commit is contained in:
Rafael Ameijeiras
commit
58af8f8d46
|
|
@ -46,7 +46,7 @@ $custom_fields = array_map(
|
|||
function ($field) {
|
||||
$field['secure'] = (bool) $field['secure'];
|
||||
if ($field['secure']) {
|
||||
$field['value'] = io_input_password($field['value']);
|
||||
$field['value'] = io_input_password(io_safe_output($field['value']));
|
||||
}
|
||||
|
||||
return $field;
|
||||
|
|
@ -75,7 +75,7 @@ if ($add_inventory_module) {
|
|||
'interval' => $interval,
|
||||
'username' => $username,
|
||||
'password' => $password,
|
||||
'custom_fields' => $custom_fields_enabled && !empty($custom_fields) ? base64_encode(json_encode($custom_fields)) : '',
|
||||
'custom_fields' => $custom_fields_enabled && !empty($custom_fields) ? base64_encode(json_encode(io_safe_output($custom_fields), JSON_UNESCAPED_UNICODE)) : '',
|
||||
];
|
||||
|
||||
$result = db_process_sql_insert('tagent_module_inventory', $values);
|
||||
|
|
@ -119,7 +119,7 @@ if ($add_inventory_module) {
|
|||
'interval' => $interval,
|
||||
'username' => $username,
|
||||
'password' => $password,
|
||||
'custom_fields' => $custom_fields_enabled && !empty($custom_fields) ? base64_encode(json_encode($custom_fields)) : '',
|
||||
'custom_fields' => $custom_fields_enabled && !empty($custom_fields) ? base64_encode(json_encode(io_safe_output($custom_fields, true), JSON_UNESCAPED_UNICODE)) : '',
|
||||
];
|
||||
|
||||
$result = db_process_sql_update('tagent_module_inventory', $values, ['id_agent_module_inventory' => $id_agent_module_inventory, 'id_agente' => $id_agente]);
|
||||
|
|
|
|||
|
|
@ -2884,6 +2884,7 @@ function html_print_input_password(
|
|||
$class='',
|
||||
$autocomplete='off',
|
||||
$hide_div_eye=false,
|
||||
$div_class=''
|
||||
) {
|
||||
if ($maxlength == 0) {
|
||||
$maxlength = 255;
|
||||
|
|
@ -2914,7 +2915,7 @@ function html_print_input_password(
|
|||
}
|
||||
}
|
||||
|
||||
return '<div class="relative container-div-input-password">'.html_print_input_text_extended($name, $value, 'password-'.$name, $alt, $size, $maxlength, $disabled, '', $attr, $return, true, '', $autocomplete, false, $hide_div_eye).'</div>';
|
||||
return '<div class="relative container-div-input-password '.$div_class.'">'.html_print_input_text_extended($name, $value, 'password-'.$name, $alt, $size, $maxlength, $disabled, '', $attr, $return, true, '', $autocomplete, false, $hide_div_eye).'</div>';
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -7459,13 +7459,20 @@ function ui_get_inventory_module_add_form(
|
|||
0,
|
||||
'',
|
||||
__('Select inventory module'),
|
||||
0,
|
||||
'',
|
||||
true,
|
||||
false,
|
||||
false,
|
||||
'w100p',
|
||||
false,
|
||||
'width: 100%'
|
||||
'width: 100%',
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
'',
|
||||
false,
|
||||
false,
|
||||
true
|
||||
)
|
||||
);
|
||||
} else {
|
||||
|
|
@ -7560,81 +7567,95 @@ function ui_get_inventory_module_add_form(
|
|||
$table->data['userpass-row'] = $row;
|
||||
|
||||
$row = [];
|
||||
$row['hidden-title'] = '';
|
||||
$row['hidden-input'] = html_print_input_hidden('hidden-custom-field-name', '', true);
|
||||
$row['hidden-input'] .= html_print_input_hidden('hidden-custom-field-is-secure', 0, true);
|
||||
$row['hidden-input'] .= html_print_input_text(
|
||||
'hidden-custom-field-input',
|
||||
'',
|
||||
'',
|
||||
25,
|
||||
40,
|
||||
true,
|
||||
false,
|
||||
false,
|
||||
'',
|
||||
'w93p'
|
||||
);
|
||||
$row['hidden-input'] .= html_print_image(
|
||||
'images/delete.svg',
|
||||
true,
|
||||
[
|
||||
'border' => '0',
|
||||
'title' => __('Remove'),
|
||||
'style' => 'cursor: pointer;',
|
||||
'class' => 'remove-custom-field invert_filter',
|
||||
]
|
||||
);
|
||||
|
||||
$table->data['hidden-custom-field-row'] = $row;
|
||||
$table->data['hidden-custom-field-row'] = html_print_label_input_block(
|
||||
'',
|
||||
'<div class="agent_details_agent_data">'.html_print_input_hidden(
|
||||
'hidden-custom-field-name',
|
||||
'',
|
||||
true
|
||||
).html_print_input_hidden(
|
||||
'hidden-custom-field-is-secure',
|
||||
0,
|
||||
true
|
||||
).html_print_input_text(
|
||||
'hidden-custom-field-input',
|
||||
'',
|
||||
'',
|
||||
25,
|
||||
40,
|
||||
true,
|
||||
false,
|
||||
false,
|
||||
'',
|
||||
'w100p'
|
||||
).html_print_image(
|
||||
'images/delete.svg',
|
||||
true,
|
||||
[
|
||||
'border' => '0',
|
||||
'title' => __('Remove'),
|
||||
'style' => 'cursor: pointer;',
|
||||
'class' => 'remove-custom-field invert_filter main_menu_icon',
|
||||
]
|
||||
).'</div>'
|
||||
);
|
||||
$table->colspan['hidden-custom-field-row'][0] = 2;
|
||||
|
||||
if ($custom_fields_enabled) {
|
||||
foreach ($custom_fields as $i => $field) {
|
||||
$row = [];
|
||||
$row['title'] = '<b>'.$field['name'].'</b>';
|
||||
$row['input'] = html_print_input_hidden(
|
||||
'custom_fields['.$i.'][name]',
|
||||
$field['name'],
|
||||
true
|
||||
);
|
||||
$row['input'] .= html_print_input_hidden(
|
||||
'custom_fields['.$i.'][secure]',
|
||||
$field['secure'],
|
||||
true
|
||||
);
|
||||
if ($field['secure']) {
|
||||
$row['input'] .= html_print_input_password(
|
||||
$secure = html_print_input_password(
|
||||
'custom_fields['.$i.'][value]',
|
||||
$field['value'],
|
||||
io_safe_input($field['value']),
|
||||
'',
|
||||
25,
|
||||
false,
|
||||
40,
|
||||
true
|
||||
true,
|
||||
false,
|
||||
false,
|
||||
'',
|
||||
'off',
|
||||
false,
|
||||
'w100p'
|
||||
);
|
||||
} else {
|
||||
$row['input'] .= html_print_input_text(
|
||||
$secure = html_print_input_text(
|
||||
'custom_fields['.$i.'][value]',
|
||||
$field['value'],
|
||||
io_safe_input($field['value']),
|
||||
'',
|
||||
25,
|
||||
false,
|
||||
40,
|
||||
true
|
||||
true,
|
||||
false,
|
||||
false,
|
||||
'',
|
||||
'w100p'
|
||||
);
|
||||
}
|
||||
|
||||
$row['input'] .= '<span> </span>';
|
||||
$row['input'] .= html_print_image(
|
||||
'images/delete.svg',
|
||||
true,
|
||||
[
|
||||
'border' => '0',
|
||||
'title' => __('Remove'),
|
||||
'style' => 'cursor: pointer;',
|
||||
'class' => 'remove-custom-field invert_filter',
|
||||
]
|
||||
$table->colspan['custom-field-row-'.$i][0] = 2;
|
||||
$table->data['custom-field-row-'.$i] = html_print_label_input_block(
|
||||
$field['name'],
|
||||
'<div class="agent_details_agent_data">'.html_print_input_hidden(
|
||||
'custom_fields['.$i.'][name]',
|
||||
$field['name'],
|
||||
true
|
||||
).html_print_input_hidden(
|
||||
'custom_fields['.$i.'][secure]',
|
||||
$field['secure'],
|
||||
true
|
||||
).$secure.html_print_image(
|
||||
'images/delete.svg',
|
||||
true,
|
||||
[
|
||||
'border' => '0',
|
||||
'title' => __('Remove'),
|
||||
'style' => 'cursor: pointer;',
|
||||
'class' => 'remove-custom-field invert_filter main_menu_icon',
|
||||
]
|
||||
).'</div>'
|
||||
);
|
||||
|
||||
$table->data['custom-field-row-'.$i] = $row;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -7693,46 +7714,50 @@ function ui_get_inventory_module_add_form(
|
|||
$("#inventory-module-form-userpass-row").hide();
|
||||
$("#inventory-module-form-custom-fields-row").show();
|
||||
$("tr[id^=inventory-module-form-custom-field-row-]").show();
|
||||
$('#inventory-module-form-custom-fields-button').show();
|
||||
} else {
|
||||
$("#inventory-module-form-userpass-row").show();
|
||||
$("#inventory-module-form-custom-fields-row").hide();
|
||||
$("tr[id^=inventory-module-form-custom-field-row-]").hide();
|
||||
$('#inventory-module-form-custom-fields-button').hide();
|
||||
}
|
||||
}
|
||||
|
||||
function add_row_for_custom_field (fieldName, isSecure) {
|
||||
var custom_fields_num = $("tr[id^=inventory-module-form-custom-field-row-]").length;
|
||||
$("#inventory-module-form-hidden-custom-field-row")
|
||||
.clone()
|
||||
.prop("id", "inventory-module-form-custom-field-row-" + custom_fields_num)
|
||||
.children("#inventory-module-form-hidden-custom-field-row-hidden-title")
|
||||
.prop("id", "inventory-module-form-custom-field-row-title-" + custom_fields_num)
|
||||
.html("<b>" + fieldName + "</b>")
|
||||
.parent()
|
||||
.children("#inventory-module-form-hidden-custom-field-row-hidden-input")
|
||||
.prop("id", "inventory-module-form-custom-field-row-input-" + custom_fields_num)
|
||||
.prop("colspan", 2)
|
||||
.children("input[name=hidden-custom-field-name]")
|
||||
.clone()
|
||||
.prop("id", "inventory-module-form-custom-field-row-" + custom_fields_num)
|
||||
.children("[id^='inventory-module-form-hidden-custom-field-row']") // go to TD
|
||||
.prop("id", "inventory-module-form-hidden-custom-field-row-"+ custom_fields_num)
|
||||
.children() // go to DIV
|
||||
.find('label')
|
||||
.html(fieldName)
|
||||
.parent() // up to DIV padre
|
||||
.find('div') //go to DIV no label
|
||||
.children("[id^=hidden-hidden-custom-field-name]")
|
||||
.prop("id", "custom-field-name-" + custom_fields_num)
|
||||
.prop("name", "custom_fields[" + custom_fields_num + "][name]")
|
||||
.val(fieldName)
|
||||
.prop("value", fieldName)
|
||||
.parent()
|
||||
.children("input[name=hidden-custom-field-is-secure]")
|
||||
.prop("id", "custom-field-is-secure-" + custom_fields_num)
|
||||
.prop("name", "custom_fields[" + custom_fields_num + "][secure]")
|
||||
.val(isSecure ? 1 : 0)
|
||||
.parent()
|
||||
.children("input[name=hidden-custom-field-input]")
|
||||
.prop("id", "custom-field-input-" + custom_fields_num)
|
||||
.prop("type", isSecure ? "password" : "text")
|
||||
.prop("name", "custom_fields[" + custom_fields_num + "][value]")
|
||||
.parent()
|
||||
.children("img.remove-custom-field")
|
||||
.click(remove_custom_field)
|
||||
.parent()
|
||||
.parent()
|
||||
.insertBefore($("#inventory-module-form-custom-fields-row"))
|
||||
.show();
|
||||
.children("input[name=hidden-custom-field-is-secure]")
|
||||
.prop("id", "custom-field-is-secure-" + custom_fields_num)
|
||||
.prop("name", "custom_fields[" + custom_fields_num + "][secure]")
|
||||
.val(isSecure ? 1 : 0)
|
||||
.parent()
|
||||
.children("input[name=hidden-custom-field-input]")
|
||||
.prop("id", "custom-field-input-" + custom_fields_num)
|
||||
.prop("type", isSecure ? "password" : "text")
|
||||
.prop("name", "custom_fields[" + custom_fields_num + "][value]")
|
||||
.parent()
|
||||
.children("img.remove-custom-field")
|
||||
.click(remove_custom_field)
|
||||
.parent()
|
||||
.parent()
|
||||
.parent() // up to TD
|
||||
.parent() // up to TR
|
||||
.insertBefore($("#inventory-module-form-custom-fields-row"))
|
||||
.show();
|
||||
}
|
||||
|
||||
function add_custom_field () {
|
||||
|
|
|
|||
Loading…
Reference in New Issue