From 217cffbf05cdb9ba1dc678f411fa59cc2682ef7f Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Thu, 2 Mar 2017 15:45:27 +0100 Subject: [PATCH 1/4] Merge um packages system. Ticket #439 --- pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 2 ++ pandora_console/extras/pandoradb_migrate_6.0_to_7.0.oracle.sql | 2 ++ pandora_console/pandoradb.data.oracle.sql | 1 + pandora_console/pandoradb_data.sql | 1 + 4 files changed, 6 insertions(+) diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index 235fdfd12b..eac74deb9b 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -158,6 +158,8 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_pur INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 0); UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager'; +DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise'; +INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '700'); -- --------------------------------------------------------------------- -- Table `tplanned_downtime_agents` diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.oracle.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.oracle.sql index 3a33516c72..482c58b3fc 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.oracle.sql @@ -81,6 +81,8 @@ INSERT INTO tconfig (token, value) VALUES ('small_operation_step_datos_purge', ' INSERT INTO tconfig (token, value) VALUES ('days_autodisable_deletion', '30'); INSERT INTO tconfig (token, value) VALUES ('MR', 0); UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager'; +DELETE FROM tconfig WHERE token = 'current_package_enterprise'; +INSERT INTO tconfig (token, value) VALUES ('current_package_enterprise', 700); -- --------------------------------------------------------------------- -- Table `tplanned_downtime_agents` diff --git a/pandora_console/pandoradb.data.oracle.sql b/pandora_console/pandoradb.data.oracle.sql index 5f7c2eb688..55713f1536 100644 --- a/pandora_console/pandoradb.data.oracle.sql +++ b/pandora_console/pandoradb.data.oracle.sql @@ -138,6 +138,7 @@ INSERT INTO tconfig (token, value) VALUES ('custom_report_front_footer', ''); INSERT INTO tconfig (token, value) VALUES ('identification_reminder', 1); INSERT INTO tconfig (token, value) VALUES ('identification_reminder_timestamp', 0); INSERT INTO tconfig (token, value) VALUES ('MR', 0); +INSERT INTO tconfig (token, value) VALUES ('current_package_enterprise', 700); INSERT INTO tconfig (token, value) VALUES ('post_process_custom_values', '{"0.00000038580247":"Seconds to months","0.00000165343915":"Seconds to weeks","0.00001157407407":"Seconds to days","0.01666666666667":"Seconds to minutes","0.00000000093132":"Bytes to Gigabytes","0.00000095367432":"Bytes to Megabytes","0.0009765625":"Bytes to Kilobytes","0.00000001653439":"Timeticks to weeks","0.00000011574074":"Timeticks to days"}'); COMMIT; diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 0845ffdcb0..6add5928f5 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -112,6 +112,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 0), ('identification_reminder', 1), ('identification_reminder_timestamp', 0), +('current_package_enterprise', '700'), ('post_process_custom_values', '{"0.00000038580247":"Seconds to months","0.00000165343915":"Seconds to weeks","0.00001157407407":"Seconds to days","0.01666666666667":"Seconds to minutes","0.00000000093132":"Bytes to Gigabytes","0.00000095367432":"Bytes to Megabytes","0.0009765625":"Bytes to Kilobytes","0.00000001653439":"Timeticks to weeks","0.00000011574074":"Timeticks to days"}'); UNLOCK TABLES; From 99c176daf8638b90887482e96e323fbd39defa9d Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Thu, 2 Mar 2017 15:50:05 +0100 Subject: [PATCH 2/4] Fixed problems with graphs when using visual console maps and pure vision. --- pandora_console/include/functions_visual_map.php | 3 ++- pandora_console/operation/visual_console/render_view.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index 3a2923eb6c..4e356faf43 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -906,7 +906,8 @@ else{ } } - $only_image = !$graph_javascript || $isExternalLink; + $only_image = !$graph_javascript && $isExternalLink; + if ($layoutData['id_custom_graph'] != 0) { // Show only avg on the visual console if (get_parameter('action') == 'edit') { diff --git a/pandora_console/operation/visual_console/render_view.php b/pandora_console/operation/visual_console/render_view.php index 24855f5c76..55f0af0aad 100755 --- a/pandora_console/operation/visual_console/render_view.php +++ b/pandora_console/operation/visual_console/render_view.php @@ -149,7 +149,7 @@ if ($config['pure']) { // Container of the visual map (ajax loaded) echo '
' . visual_map_print_visual_map ($id_layout, true, true, - null, null, '', false, $graph_javascript) + null, null, '', false, true) . '
'; // Floating menu - Start @@ -204,7 +204,7 @@ if ($config['pure']) { Date: Thu, 2 Mar 2017 16:14:42 +0100 Subject: [PATCH 3/4] Fixed agents when changing groups --- pandora_console/operation/events/sound_events.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php index 29c845d2e0..d0c8f79c9a 100644 --- a/pandora_console/operation/events/sound_events.php +++ b/pandora_console/operation/events/sound_events.php @@ -141,8 +141,7 @@ function changeGroup() { }, function (data) { $("#id_agents").empty(); - $("#id_agents").style("size", 0); - + jQuery.each (data, function (id, value) { if (value != "") { $("#id_agents").append(''); From 31ea5bf5ecb61dfc4ad254ff3cee643e7d03eb18 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Thu, 2 Mar 2017 16:36:54 +0100 Subject: [PATCH 4/4] Added Time lapse in #434 --- .../godmode/reporting/reporting_builder.list_items.php | 2 +- .../include/help/en/help_reporting_time_lapse.php | 8 ++++++++ .../include/help/es/help_reporting_time_lapse.php | 8 ++++++++ .../include/help/ja/help_reporting_time_lapse.php | 8 ++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 pandora_console/include/help/en/help_reporting_time_lapse.php create mode 100644 pandora_console/include/help/es/help_reporting_time_lapse.php create mode 100644 pandora_console/include/help/ja/help_reporting_time_lapse.php diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php index de837beb7d..7419f27c03 100755 --- a/pandora_console/godmode/reporting/reporting_builder.list_items.php +++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php @@ -299,7 +299,7 @@ if ($items) { $table->head[3] .= ' ' . html_print_image("images/sort_up.png", true, array("title" => __('Ascendent'))) . '' . '' . html_print_image("images/sort_down.png", true, array("title" => __('Descent'))) . ''; } - $table->head[4] = __('Period'); + $table->head[4] = __('Time lapse'); $table->head[5] = __('Name') . " / " . __('Description'); if (check_acl ($config['id_user'], 0, "RM")) { $table->head[6] = '' . __('Op.') . ''; diff --git a/pandora_console/include/help/en/help_reporting_time_lapse.php b/pandora_console/include/help/en/help_reporting_time_lapse.php new file mode 100644 index 0000000000..df57594e42 --- /dev/null +++ b/pandora_console/include/help/en/help_reporting_time_lapse.php @@ -0,0 +1,8 @@ + +

Reports - Time lapse

+
+This is the range, or period of time over which the report renders the information for this report type. For example, a week means data from a week ago from now. \ No newline at end of file diff --git a/pandora_console/include/help/es/help_reporting_time_lapse.php b/pandora_console/include/help/es/help_reporting_time_lapse.php new file mode 100644 index 0000000000..4f6305b9a6 --- /dev/null +++ b/pandora_console/include/help/es/help_reporting_time_lapse.php @@ -0,0 +1,8 @@ + +

Reports - Time lapse

+
+Este es el lapso de tiempo que refleja el informe. Si es una semana, por ejemplo, el informe mostrará los datos desde hace una semana hasta ahora \ No newline at end of file diff --git a/pandora_console/include/help/ja/help_reporting_time_lapse.php b/pandora_console/include/help/ja/help_reporting_time_lapse.php new file mode 100644 index 0000000000..df57594e42 --- /dev/null +++ b/pandora_console/include/help/ja/help_reporting_time_lapse.php @@ -0,0 +1,8 @@ + +

Reports - Time lapse

+
+This is the range, or period of time over which the report renders the information for this report type. For example, a week means data from a week ago from now. \ No newline at end of file