From 1c257dd01c3d1135433f87394b1667f76c122bdb Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Tue, 27 Aug 2013 16:58:13 -0400 Subject: [PATCH 1/5] BUG 12749 "Incrementar el valor del memory_limit..." SOLVED - Incrementar el valor del memory_limit que viene por defecto en el env.ini y en el php.ini - Problema resuelto, se ha incrementado de valor del "memory_limit" de 128M a 256M. * Available from version ProcessMaker-2.5.2-testing.1 --- gulliver/system/class.bootstrap.php | 2 +- workflow/engine/bin/cron_single.php | 3 ++- workflow/engine/classes/class.system.php | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gulliver/system/class.bootstrap.php b/gulliver/system/class.bootstrap.php index 9cf874831..3a95265bc 100644 --- a/gulliver/system/class.bootstrap.php +++ b/gulliver/system/class.bootstrap.php @@ -85,7 +85,7 @@ class Bootstrap } // default configuration - $config = array('debug' => 0, 'debug_sql' => 0, 'debug_time' => 0, 'debug_calendar' => 0, 'wsdl_cache' => 1, 'memory_limit' => '128M', 'time_zone' => 'America/New_York', 'memcached' => 0, 'memcached_server' => '', 'default_skin' => 'neoclassic', 'default_lang' => 'en', 'proxy_host' => '', 'proxy_port' => '', 'proxy_user' => '', 'proxy_pass' => '' ); + $config = array('debug' => 0, 'debug_sql' => 0, 'debug_time' => 0, 'debug_calendar' => 0, 'wsdl_cache' => 1, 'memory_limit' => "256M", 'time_zone' => 'America/New_York', 'memcached' => 0, 'memcached_server' => '', 'default_skin' => 'neoclassic', 'default_lang' => 'en', 'proxy_host' => '', 'proxy_port' => '', 'proxy_user' => '', 'proxy_pass' => '' ); // read the global env.ini configuration file if ($readGlobalIniFile && ($globalConf = @parse_ini_file($globalIniFile)) !== false) { diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php index eea55933b..3a8df5026 100755 --- a/workflow/engine/bin/cron_single.php +++ b/workflow/engine/bin/cron_single.php @@ -5,7 +5,8 @@ */ ini_set('display_errors', 1); error_reporting(E_ALL); -ini_set('memory_limit', '128M'); + +ini_set("memory_limit", "256M"); if (!defined('SYS_LANG')) { define('SYS_LANG', 'en'); diff --git a/workflow/engine/classes/class.system.php b/workflow/engine/classes/class.system.php index 1d83b53ac..b03495e62 100755 --- a/workflow/engine/classes/class.system.php +++ b/workflow/engine/classes/class.system.php @@ -1074,8 +1074,7 @@ class System } // default configuration - $config = array ('debug' => 0,'debug_sql' => 0,'debug_time' => 0,'debug_calendar' => 0,'wsdl_cache' => 1,'memory_limit' => '128M','time_zone' => 'America/New_York','memcached' => 0,'memcached_server' => '','default_skin' => 'neoclassic','default_lang' => 'en','proxy_host' => '','proxy_port' => '','proxy_user' => '','proxy_pass' => '' - ); + $config = array ('debug' => 0,'debug_sql' => 0,'debug_time' => 0,'debug_calendar' => 0,'wsdl_cache' => 1,'memory_limit' => "256M", 'time_zone' => 'America/New_York','memcached' => 0,'memcached_server' => '','default_skin' => 'neoclassic','default_lang' => 'en','proxy_host' => '','proxy_port' => '','proxy_user' => '','proxy_pass' => ''); // read the global env.ini configuration file if ($readGlobalIniFile && ($globalConf = @parse_ini_file( $globalIniFile )) !== false) { From cf2057a8c98de33514fa0a0333a059b1abafd410 Mon Sep 17 00:00:00 2001 From: Hector Cortez Date: Wed, 28 Aug 2013 10:11:09 -0400 Subject: [PATCH 2/5] BUG 12759 Problemas en las instalacion al momento de configurar el servidor MySql SOLVED - Problemas en las instalacion al momento de configurar el servidor MySql - Adjustment in the error message in the initial configuration. --- workflow/engine/controllers/installer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index f2a1c2233..442c97ce4 100755 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -1164,7 +1164,7 @@ class Installer extends Controller $db_password = $_REQUEST['db_password']; $fp = @fsockopen( $db_hostname, $db_port, $errno, $errstr, 30 ); if (! $fp) { - $info->message .= G::LoadTranslation('ID_CONNECTION_ERROR', SYS_LANG, Array($errstr ($errno))); + $info->message .= G::LoadTranslation('ID_CONNECTION_ERROR', SYS_LANG, Array("$errstr ($errno)")); return $info; } @@ -1204,7 +1204,7 @@ class Installer extends Controller $fp = @fsockopen( $db_hostname, $db_port, $errno, $errstr, 30 ); if (! $fp) { - $info->message .= G::LoadTranslation('ID_CONNECTION_ERROR', SYS_LANG, Array($errstr ($errno))); + $info->message .= G::LoadTranslation('ID_CONNECTION_ERROR', SYS_LANG, Array("$errstr ($errno)")); return $info; } From 7b77b1a2ccf30f43551f7407c0f5dbac542a71b5 Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Wed, 28 Aug 2013 16:43:24 -0400 Subject: [PATCH 3/5] BUG 11934 "Posicion del Label en objetos CheckBox..." SOLVED - Posicion del Label en objetos CheckBox (ProcessMaker 2.5.0.1) - Problema resuelto, al crear un campo de tipo CheckBox, al seleccionar la opcion "Label on the right side", se alineara el Label a la derecha y si no esta seleccionado, se alineara a la izquierda. * Available from version ProcessMaker-2.5.2-testing.1 --- gulliver/system/class.xmlform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index d3b4064dd..a7047565c 100755 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -3028,7 +3028,7 @@ class XmlForm_Field_Checkbox extends XmlForm_Field public $required = false; public $value = 'on'; public $falseValue = 'off'; - public $labelOnRight = true; + public $labelOnRight = false; public $readOnly = false; /** From 3b039201bf31d9daf1b6c915b3631eade2fa3522 Mon Sep 17 00:00:00 2001 From: roly Date: Thu, 29 Aug 2013 09:08:54 -0400 Subject: [PATCH 4/5] =?UTF-8?q?Adici=C3=B3n=20de=20la=20funci=C3=B3n=20fal?= =?UTF-8?q?tante=20que=20originaba=20el=20problema=20de=20despliegue=20de?= =?UTF-8?q?=20usuarios=20de=20grupo=20en=20las=20propiedades=20de=20una=20?= =?UTF-8?q?tarea.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xmlform/users/users_ShortOptionsAdhoc.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) mode change 100755 => 100644 workflow/engine/xmlform/users/users_ShortOptionsAdhoc.xml diff --git a/workflow/engine/xmlform/users/users_ShortOptionsAdhoc.xml b/workflow/engine/xmlform/users/users_ShortOptionsAdhoc.xml old mode 100755 new mode 100644 index 46d98038a..628a88d70 --- a/workflow/engine/xmlform/users/users_ShortOptionsAdhoc.xml +++ b/workflow/engine/xmlform/users/users_ShortOptionsAdhoc.xml @@ -70,5 +70,19 @@ var changeView = function(iType) Pm.tmp.usersPanel.currentRPC.make(); }; +var usersGroup = function(GRP_UID, c){ + var div = document.getElementById('users'+c); + div.style.display = (div.style.display == 'none') ? 'block' : 'none'; + + var oRPC = new leimnud.module.rpc.xmlhttp({ + url : '../users/users_Ajax', + async : false, + method: 'POST', + args : 'function=usersGroup&GRP_UID=' + GRP_UID + }); + oRPC.make(); + div.innerHTML=oRPC.xmlhttp.responseText; +}; + ]]> \ No newline at end of file From 8003fe102ed8cad7ffef2b16e47175f55450d002 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Fri, 30 Aug 2013 10:32:17 -0400 Subject: [PATCH 5/5] Adicion de formulario para evitar installer para Linux con el PARTNER_FLAG --- workflow/engine/controllers/installer.php | 8 ++++++++ .../templates/installer/mainStopInstall.html | 5 +++++ .../engine/templates/installer/stopInstall.js | 16 ++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 workflow/engine/templates/installer/mainStopInstall.html create mode 100644 workflow/engine/templates/installer/stopInstall.js diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index 442c97ce4..d13495df5 100755 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -35,6 +35,14 @@ class Installer extends Controller public function index ($httpData) { + $partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false; + if ($partnerFlag){ + $this->includeExtJS( 'installer/stopInstall'); + $this->setView( 'installer/mainStopInstall' ); + G::RenderPage( 'publish', 'extJs' ); + return; + } + $licenseContent = file_get_contents( PATH_TRUNK . 'LICENSE.txt' ); $this->includeExtJS( 'installer/CardLayout', false ); diff --git a/workflow/engine/templates/installer/mainStopInstall.html b/workflow/engine/templates/installer/mainStopInstall.html new file mode 100644 index 000000000..d2d829d71 --- /dev/null +++ b/workflow/engine/templates/installer/mainStopInstall.html @@ -0,0 +1,5 @@ + + +
+
+
\ No newline at end of file diff --git a/workflow/engine/templates/installer/stopInstall.js b/workflow/engine/templates/installer/stopInstall.js new file mode 100644 index 000000000..ff743d8a6 --- /dev/null +++ b/workflow/engine/templates/installer/stopInstall.js @@ -0,0 +1,16 @@ +Ext.onReady(function() { + + var formLicenseLog = new Ext.FormPanel({ + labelWidth : 60, + frame : true, + autoScroll: true, + monitorValid : true, + renderTo : 'bodyNoInsatalled', + title : _('ID_TITLE_NO_INSTALL'), + + items:[ + {html: _('ID_NO_INSTALL')} + ] + }); +}); +