Merge remote-tracking branch 'origin/develop' into 3325-Desaparicion_de_los_desplegables_en_module_component_al_crear_un_modulo

Former-commit-id: 9d128ea51bb2bf42c6d97c4f6b8378457028dae9
2018-12-28 11:54:12 +01:00 · 2018-12-28 11:54:12 +01:00 · 17e773adcb
parent 6d8b73f72e 2260e8d82a
commit 17e773adcb
28 changed files with 34 additions and 41 deletions
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.730-181227
+Version: 7.0NG.730-181228
 Architecture: all
 Priority: optional
 Section: admin
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-pandora_version="7.0NG.730-181227"
+pandora_version="7.0NG.730-181228"

 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;

 use constant AGENT_VERSION => '7.0NG.730';
-use constant AGENT_BUILD => '181227';
+use constant AGENT_BUILD => '181228';

 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.730
-%define release     181227
+%define release     181228

 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.730
-%define release     181227
+%define release     181228

 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@ -10,7 +10,7 @@
 # **********************************************************************

 PI_VERSION="7.0NG.730"
-PI_BUILD="181227"
+PI_BUILD="181228"
 OS_NAME=`uname -s`

 FORCE=0
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@ -186,7 +186,7 @@ UpgradeApplicationID
 {}

 Version
-{181227}
+{181228}

 ViewReadme
 {Yes}
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;

 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.730(Build 181227)")
+#define PANDORA_VERSION ("7.0NG.730(Build 181228)")

 string pandora_path;
 string pandora_dir;
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@ -11,7 +11,7 @@ BEGIN
      VALUE "LegalCopyright", "Artica ST"
      VALUE "OriginalFilename", "PandoraAgent.exe"
      VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.730(Build 181227))"
+      VALUE "ProductVersion", "(7.0NG.730(Build 181228))"
      VALUE "FileVersion", "1.0.0.0"
    END
  END
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.730-181227
+Version: 7.0NG.730-181228
 Architecture: all
 Priority: optional
 Section: admin
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-pandora_version="7.0NG.730-181227"
+pandora_version="7.0NG.730-181228"

 package_pear=0
 package_pandora=1
--- a/pandora_console/godmode/agentes/module_manager_editor.php
+++ b/pandora_console/godmode/agentes/module_manager_editor.php
@ -573,7 +573,9 @@ ui_require_javascript_file ('pandora_modules');
 ?>
 <script language="javascript">
 /* <![CDATA[ */
-var no_name_lang = "<?php echo __('No module name provided') ?>";
+var no_name_lang =`
+<?php echo ui_print_info_message ( array('no_close'=>true, 'message'=>  __('No module name provided') ) ); ?>
+`;
 var no_target_lang = "<?php echo __('No target IP provided') ?>";
 var no_oid_lang = "<?php echo __('No SNMP OID provided') ?>";
 var no_prediction_module_lang = "<?php echo __('No module to predict') ?>";
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@ -22,7 +22,7 @@
 /**
 * Pandora build version and version
 */
-$build_version = 'PC181227';
+$build_version = 'PC181228';
 $pandora_version = 'v7.0NG.730';

 // Do not overwrite default timezone set if defined.
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@ -412,7 +412,7 @@ function flot_pie_chart ($values, $labels, $width, $height, $water_mark,
 	include_javascript_dependencies_flot_graph();

 	$return .= "<script type='text/javascript'>";
-
+	$return .= "$(document).ready( function () {";
 	$return .= "pandoraFlotPie('$graph_id', '$values', '$labels',
 		'$series', '$width', $font_size, $water_mark, '$separator',
 		'$legend_position', '$height', '$colors', " . json_encode($hide_labels) . ")";
--- a/pandora_console/include/javascript/jquery.pandora.js
+++ b/pandora_console/include/javascript/jquery.pandora.js
@ -25,18 +25,9 @@
 	};

 	$.fn.showMessage = function (msg) {
-		return $(this)
-			.hide ()
-			.empty ()
-			.html (
-				'<table cellspacing="0" cellpadding="0" id="" class="info_box error textodialogo" style="">'
-					+ '<tbody>' + '<tr>'
-					+ '<td class="icon" rowspan="2" style="padding-right: 10px; padding-top: 3px;"><img src="http://localhost/pandora_console/images/err.png"></td>'
-					+ '<td class="title" style="text-transform: uppercase; padding-top: 10px;"><b>Error</b></td>'
-					+ '</tr><tr>'
-					+ '<td style="color:#333;padding-top:10px">'+msg+'</td>'
-					+ '<td></td></tr></tbody></table>'
-			)
+		return $(this).hide ().empty ()
+		// here, previously .text (msg)
+				.html (msg)
 				.slideDown ();
 		};
 }) (jQuery);
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@ -116,7 +116,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.730';
-$build = '181227';
+$build = '181228';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.730
-%define release     181227
+%define release     181228

 # User and Group under which Apache is running
 %define httpd_name  httpd
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.730
-%define release     181227
+%define release     181228
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.730-181227
+Version: 7.0NG.730-181228
 Architecture: all
 Priority: optional
 Section: admin
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-pandora_version="7.0NG.730-181227"
+pandora_version="7.0NG.730-181228"

 package_cpan=0
 package_pandora=1
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@ -45,7 +45,7 @@ our @EXPORT = qw(

 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.730";
-my $pandora_build = "181227";
+my $pandora_build = "181228";
 our $VERSION = $pandora_version." ".$pandora_build;

 # Setup hash
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@ -32,7 +32,7 @@ our @ISA = qw(Exporter);

 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.730";
-my $pandora_build = "181227";
+my $pandora_build = "181228";
 our $VERSION = $pandora_version." ".$pandora_build;

 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.730
-%define release     181227
+%define release     181228

 Summary:            Pandora FMS Server
 Name:               %{name}
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.730
-%define release     181227
+%define release     181228

 Summary:            Pandora FMS Server
 Name:               %{name}
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@ -9,7 +9,7 @@
 # **********************************************************************

 PI_VERSION="7.0NG.730"
-PI_BUILD="181227"
+PI_BUILD="181228"

 MODE=$1
 if [ $# -gt 1 ]; then
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;

 # version: define current version
-my $version = "7.0NG.730 PS181227";
+my $version = "7.0NG.730 PS181228";

 # Pandora server configuration
 my %conf;
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;

 # version: define current version
-my $version = "7.0NG.730 PS181227";
+my $version = "7.0NG.730 PS181228";

 # save program name for logging
 my $progname = basename($0);