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

Merge branch '1424-Usuarios-estándar-no-pueden-cambiar-el-rango-de-tiempo-en-Gráficas-de-Agentes-dev' into 'develop'

Browse Source 
Changed period in functions_html

See merge request !901
This commit is contained in:
vgilc 2017-10-09 13:16:58 +02:00
commit b8809b2c36
5 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1079,7 +1079,6 @@ You can of course remove the warnings, that's why we include the source and do n
} }
} }
} }
// html_debug($agents);
html_print_select($agents2, 'id_agents2[]', $agents_select, $script = '', "", 0, false, true, true, '', false, "min-width: 180px"); html_print_select($agents2, 'id_agents2[]', $agents_select, $script = '', "", 0, false, true, true, '', false, "min-width: 180px");
?> ?>
</td> </td>

3
pandora_console/godmode/reporting/visual_console_builder.editor.js
View File

@ -608,9 +608,6 @@ function readFields() {
values['process_simple_value'] = $("select[name=process_value]").val(); values['process_simple_value'] = $("select[name=process_value]").val();
values['background'] = $("#background_image").val(); values['background'] = $("#background_image").val();
values['period'] = undefined != $("#hidden-period").val() ? $("#hidden-period").val() : $("#period").val(); values['period'] = undefined != $("#hidden-period").val() ? $("#hidden-period").val() : $("#period").val();
if (values['period'] == null) {
values['period'] = undefined != $("#hidden-period").val() ? $("#hidden-period").val() : $("#period_select").val();
}
values['width'] = $("input[name=width]").val(); values['width'] = $("input[name=width]").val();
values['width_data_image'] = $("#data_image_width").val(); values['width_data_image'] = $("#data_image_width").val();
if(selectedItem == 'simple_value' || creationItem == 'simple_value'){ if(selectedItem == 'simple_value' || creationItem == 'simple_value'){

27
pandora_console/include/functions_html.php
View File

@ -836,22 +836,6 @@ function html_print_extended_select_for_time ($name, $selected = '',
SECONDS_1MONTH => __('months'), SECONDS_1MONTH => __('months'),
SECONDS_1YEAR => __('years')); SECONDS_1YEAR => __('years'));
// The advanced control is only for admins
if (!is_user_admin($config['id_user'])) {
unset($fields[-1]);
$returnString = html_print_select ($fields, $name . '_select', $selected,"" . $script,
$nothing, $nothing_value, true, false, false, '', false, 'font-size: xx-small;'.$select_style);
if ($return) {
return $returnString;
}
else {
echo $returnString;
return;
}
}
if ($unique_name === true) { if ($unique_name === true) {
$uniq_name = uniqid($name); $uniq_name = uniqid($name);
} }
@ -868,13 +852,16 @@ function html_print_extended_select_for_time ($name, $selected = '',
echo '<div id="'.$uniq_name.'_default" style="width:100%;display:inline;">'; echo '<div id="'.$uniq_name.'_default" style="width:100%;display:inline;">';
html_print_select ($fields, $uniq_name . '_select', $selected,"" . $script, html_print_select ($fields, $uniq_name . '_select', $selected,"" . $script,
$nothing, $nothing_value, false, false, false, $class, $readonly, 'font-size: xx-small;'.$select_style); $nothing, $nothing_value, false, false, false, $class, $readonly, 'font-size: xx-small;'.$select_style);
echo ' <a href="javascript:">' . // The advanced control is only for admins
html_print_image('images/pencil.png', true, if (is_user_admin($config['id_user'])) {
array('class' => $uniq_name . '_toggler', echo ' <a href="javascript:">' .
html_print_image('images/pencil.png', true,
array('class' => $uniq_name . '_toggler',
'alt' => __('Custom'), 'alt' => __('Custom'),
'title' => __('Custom'), 'title' => __('Custom'),
'style' => 'width: 18px;'.$style_icon), false, false, true) . 'style' => 'width: 18px;'.$style_icon), false, false, true) .
'</a>'; '</a>';
}
echo '</div>'; echo '</div>';
echo '<div id="'.$uniq_name.'_manual" style="width:100%;display:inline;">'; echo '<div id="'.$uniq_name.'_manual" style="width:100%;display:inline;">';

3
pandora_console/operation/agentes/interface_traffic_graph_win.php
View File

@ -140,9 +140,6 @@ $interface_traffic_modules = array(
// Get input parameters // Get input parameters
$period = get_parameter ("period"); $period = get_parameter ("period");
if ($period == "") {
$period = get_parameter ("period_select", SECONDS_1DAY);
}
$width = (int) get_parameter("width", 555); $width = (int) get_parameter("width", 555);
$height = (int) get_parameter("height", 245); $height = (int) get_parameter("height", 245);
$start_date = (string) get_parameter("start_date", date("Y-m-d")); $start_date = (string) get_parameter("start_date", date("Y-m-d"));

3
pandora_console/operation/agentes/stat_win.php
View File

@ -151,9 +151,6 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
} }
$period = get_parameter ("period"); $period = get_parameter ("period");
if ($period == "") {
$period = get_parameter ("period_select", SECONDS_1DAY);
}
$id = get_parameter ("id", 0); $id = get_parameter ("id", 0);
$width = get_parameter ("width", STATWIN_DEFAULT_CHART_WIDTH); $width = get_parameter ("width", STATWIN_DEFAULT_CHART_WIDTH);
$height = get_parameter ("height", STATWIN_DEFAULT_CHART_HEIGHT); $height = get_parameter ("height", STATWIN_DEFAULT_CHART_HEIGHT);