tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

#11315 Change type of select to select_from_sql

Browse Source
This commit is contained in:
Jorge Rincon 2023-07-18 09:34:14 +02:00
parent bff3fcd762
commit 844f61cc73
2 changed files with 14 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pandora_console/include/functions_html.php
View File

@ -1740,8 +1740,8 @@ function html_print_select_multiple_modules_filtered(array $data):string
[ [
'label' => __('Agents'), 'label' => __('Agents'),
'label_class' => 'font-title-font', 'label_class' => 'font-title-font',
'type' => 'select', 'type' => 'select_from_sql',
'fields' => $agents, 'sql' => 'SELECT `id_agente`,`nombre` FROM tagente',
'name' => 'filtered-module-agents-'.$uniqId, 'name' => 'filtered-module-agents-'.$uniqId,
'selected' => explode(',', $data['mAgents']), 'selected' => explode(',', $data['mAgents']),
'return' => true, 'return' => true,
@ -1921,8 +1921,7 @@ function html_print_extended_select_for_unit(
$select_style=false, $select_style=false,
$unique_name=true, $unique_name=true,
$disabled=false, $disabled=false,
$no_change=0, $no_change=0
$class='w100p'
) { ) {
global $config; global $config;
@ -1954,7 +1953,7 @@ function html_print_extended_select_for_unit(
ob_start(); ob_start();
echo '<div id="'.$uniq_name.'_default" class="'.$class.' inline_line">'; echo '<div id="'.$uniq_name.'_default" class="w100p inline_line">';
html_print_select( html_print_select(
$fields, $fields,
$uniq_name.'_select', $uniq_name.'_select',
@ -3925,14 +3924,6 @@ function html_print_table(&$table, $return=false)
} }
} }
if (isset($table->tdid)) {
foreach ($table->tdid as $keyrow => $tid) {
foreach ($tid as $key => $id) {
$tdid[$keyrow][$key] = $id;
}
}
}
if (isset($table->cellstyle)) { if (isset($table->cellstyle)) {
foreach ($table->cellstyle as $keyrow => $cstyle) { foreach ($table->cellstyle as $keyrow => $cstyle) {
foreach ($cstyle as $key => $cst) { foreach ($cstyle as $key => $cst) {
@ -4116,10 +4107,6 @@ function html_print_table(&$table, $return=false)
$colspan[$keyrow][$key] = ''; $colspan[$keyrow][$key] = '';
} }
if (!isset($tdid[$keyrow][$key])) {
$tdid[$keyrow][$key] = '';
}
if (!isset($rowspan[$keyrow][$key])) { if (!isset($rowspan[$keyrow][$key])) {
$rowspan[$keyrow][$key] = ''; $rowspan[$keyrow][$key] = '';
} }
@ -4140,16 +4127,10 @@ function html_print_table(&$table, $return=false)
$style[$key] = ''; $style[$key] = '';
} }
if ($tdid[$keyrow][$key] !== '') {
$tid = $tdid[$keyrow][$key];
} else {
$tid = $tableid.'-'.$keyrow.'-'.$key;
}
if ($class === 'datos5' && $key === 1) { if ($class === 'datos5' && $key === 1) {
$output .= '<td id="'.$tid.'" style="'.$cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key].$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="'.$class.' '.$cellclass[$keyrow][$key].'">'.$item.'</td>'."\n"; $output .= '<td id="'.$tableid.'-'.$keyrow.'-'.$key.'" style="'.$cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key].$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="'.$class.' '.$cellclass[$keyrow][$key].'">'.$item.'</td>'."\n";
} else { } else {
$output .= '<td id="'.$tid.'" style="'.$cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key].'" '.$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="'.$class.' '.$cellclass[$keyrow][$key].'">'.$item.'</td>'."\n"; $output .= '<td id="'.$tableid.'-'.$keyrow.'-'.$key.'" style="'.$cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key].'" '.$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="'.$class.' '.$cellclass[$keyrow][$key].'">'.$item.'</td>'."\n";
} }
} }

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

@ -9424,7 +9424,8 @@ div.stat-win-spinner img {
.select2-selection--multiple .select2-selection--multiple
.select2-selection__rendered { .select2-selection__rendered {
padding: 5px 10px 10px !important; padding: 5px 10px 10px !important;
max-height: 120px; min-height: 100px;
max-height: 250px;
overflow: auto !important; overflow: auto !important;
} }
@ -10804,10 +10805,6 @@ button.ui-button.ui-widget.submit-cancel:active {
border-color: #96a2bf; border-color: #96a2bf;
} }
.cursor-default {
cursor: default;
}
.hasColorPicker { .hasColorPicker {
z-index: 10; z-index: 10;
} }
@ -11666,8 +11663,8 @@ p.trademark-copyright {
} }
.show-hide-pass { .show-hide-pass {
position: relative; position: absolute;
right: 40px; right: 12px;
top: 4px; top: 4px;
border: 0; border: 0;
outline: none; outline: none;
@ -12303,14 +12300,6 @@ div.parent_graph > p.legend_background > table > tbody > tr {
margin: 0px !important; margin: 0px !important;
} }
form.max_floating_element_size > ul#ul_tree_azure {
background-color: #fff;
border-spacing: 0px;
border-radius: 6px;
margin-bottom: 20px;
border: 1px solid #e2e2e2;
}
#grid_img { #grid_img {
position: absolute; position: absolute;
margin-top: -2px; margin-top: -2px;
@ -12345,3 +12334,7 @@ tr[id^="network_component-plugin-wmi-fields-dynamicMacroRow-"] input,
tr[id^="network_component-plugin-snmp-fields-dynamicMacroRow-"] input { tr[id^="network_component-plugin-snmp-fields-dynamicMacroRow-"] input {
width: 100% !important; width: 100% !important;
} }
.label_agent_service > label {
margin-top: 15px;
}