mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-30 09:15:15 +02:00
Merge branch '1487-Problemas_varios_en_consolas_visuales_2' into 'develop'
fixed errors in visual console See merge request artica/pandorafms!960
This commit is contained in:
commit
e49f921ee8
@ -1150,10 +1150,10 @@ ALTER TABLE titem MODIFY `source_data` int(10) unsigned;
|
|||||||
INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100');
|
INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100');
|
||||||
INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000');
|
INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000');
|
||||||
INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30');
|
INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30');
|
||||||
INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 4);
|
INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 7);
|
||||||
UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
|
UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
|
||||||
DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
|
DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
|
||||||
INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '708');
|
INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '714');
|
||||||
|
|
||||||
-- ---------------------------------------------------------------------
|
-- ---------------------------------------------------------------------
|
||||||
-- Table `tplanned_downtime_agents`
|
-- Table `tplanned_downtime_agents`
|
||||||
|
@ -565,7 +565,7 @@ $values = array (
|
|||||||
'Tactical view'=>__('Tactical view'),
|
'Tactical view'=>__('Tactical view'),
|
||||||
'Alert detail' => __('Alert detail'),
|
'Alert detail' => __('Alert detail'),
|
||||||
'Other'=>__('Other'));
|
'Other'=>__('Other'));
|
||||||
if (enterprise_installed()) {
|
if (enterprise_installed() && !is_metaconsole()) {
|
||||||
$values['Dashboard'] = __('Dashboard');
|
$values['Dashboard'] = __('Dashboard');
|
||||||
}
|
}
|
||||||
$table->data[12][1] = html_print_select($values, 'section', io_safe_output($user_info["section"]), 'show_data_section();', '', -1, true, false, false);
|
$table->data[12][1] = html_print_select($values, 'section', io_safe_output($user_info["section"]), 'show_data_section();', '', -1, true, false, false);
|
||||||
|
@ -1176,6 +1176,15 @@ function visual_map_print_item($mode = "read", $layoutData,
|
|||||||
echo "<a href=\"$url\">";
|
echo "<a href=\"$url\">";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//for clean link text from bbdd
|
||||||
|
if (get_parameter('action') == 'edit' || get_parameter('operation') == 'edit_visualmap') {
|
||||||
|
$aux_text1 = explode("<a ", $text);
|
||||||
|
$aux_text2 = explode("\">", $aux_text1[1]);
|
||||||
|
$aux_text3 = explode("</a>", $aux_text2[1]);
|
||||||
|
|
||||||
|
$text = $aux_text1[0].$aux_text3[0].$aux_text3[1];
|
||||||
|
}
|
||||||
|
|
||||||
switch ($type) {
|
switch ($type) {
|
||||||
case BOX_ITEM:
|
case BOX_ITEM:
|
||||||
if ($width == 0 || $width == 0) {
|
if ($width == 0 || $width == 0) {
|
||||||
@ -1650,13 +1659,6 @@ function visual_map_print_item($mode = "read", $layoutData,
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case LABEL:
|
case LABEL:
|
||||||
if (get_parameter('action') == 'edit' || get_parameter('operation') == 'edit_visualmap') {
|
|
||||||
$aux_text1 = explode("<a href=\"", $text);
|
|
||||||
$aux_text2 = explode("\">", $aux_text1[1]);
|
|
||||||
$aux_text3 = explode("</a>", $aux_text2[1]);
|
|
||||||
|
|
||||||
$text = $aux_text1[0].$aux_text3[0].$aux_text3[1];
|
|
||||||
}
|
|
||||||
echo io_safe_output($text);
|
echo io_safe_output($text);
|
||||||
break;
|
break;
|
||||||
case ICON:
|
case ICON:
|
||||||
|
@ -556,7 +556,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
|
|||||||
'</td>';
|
'</td>';
|
||||||
|
|
||||||
$form_items_advance['map_linked_row'] = array();
|
$form_items_advance['map_linked_row'] = array();
|
||||||
$form_items_advance['map_linked_row']['items'] = array('static_graph', 'label');
|
$form_items_advance['map_linked_row']['items'] = array('static_graph', 'label', 'icon');
|
||||||
$form_items_advance['map_linked_row']['html'] = '<td align="left">'.
|
$form_items_advance['map_linked_row']['html'] = '<td align="left">'.
|
||||||
__('Map linked') . ui_print_help_tip (
|
__('Map linked') . ui_print_help_tip (
|
||||||
__("If a parent visual console is selected here, an agent or module cannot be selected and will be removed if a previous selection was done."), true) .
|
__("If a parent visual console is selected here, an agent or module cannot be selected and will be removed if a previous selection was done."), true) .
|
||||||
|
Loading…
x
Reference in New Issue
Block a user