From bd638dde23137afc9493efb5d4f7979eb0e6e3b2 Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Thu, 16 Apr 2015 14:54:27 -0400 Subject: [PATCH 01/10] PM-2314,PM-2331 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PM-2314,En ADMIN > Plugins > Enterprise features el status del actionByEmail y el pmConsolidatedCL es "Install now" y este deberíestar como Installed y estas opciones ya deberí estar instaladas PM-2331,Admin/Plugins/Enterprise Features -> Eliminar columna de status en listado de features Dentro el tab "Enterprise features" se quito la columna status (PM-2331), Se agregaran los new features al ejecutar en consola ./processmaker databa-upgrade(PM-2314), --- .../engine/classes/class.licensedFeatures.php | 179 ++++++++++++++++++ workflow/engine/classes/class.wsTools.php | 4 + .../templates/enterprise/addonsStore.js | 48 ----- 3 files changed, 183 insertions(+), 48 deletions(-) diff --git a/workflow/engine/classes/class.licensedFeatures.php b/workflow/engine/classes/class.licensedFeatures.php index f2aef8649..16982bb7a 100644 --- a/workflow/engine/classes/class.licensedFeatures.php +++ b/workflow/engine/classes/class.licensedFeatures.php @@ -27,6 +27,59 @@ class PMLicensedFeatures { private $featuresDetails = array (); private $features = array (); + private $newFeatures = array( + 0 => array( + "description" => "Enables de Actions By Email feature", + "enabled" => false, + "id" => "actionsByEmail", + "latest_version" => "", + "log" => null, + "name" => "actionsByEmail", + "nick" => "actionsByEmail", + "progress" => 0, + "publisher" => "Colosa", + "release_type" => "localRegistry", + "status" => "ready", + "store" => "00000000000000000000000000010004", + "type" => "features", + "url" => "", + "version" => "" + ), + 1 => array( + "description" => "Enables de Batch Routing feature", + "enabled" => false, + "id" => "pmConsolidatedCL", + "latest_version" => "", + "log" => null, + "name" => "pmConsolidatedCL", + "nick" => "pmConsolidatedCL", + "progress" => 0, + "publisher" => "Colosa", + "release_type" => "localRegistry", + "status" => "ready", + "store" => "00000000000000000000000000010005", + "type" => "features", + "url" => "", + "version" => "" + ), + 2 => array( + "description" => "Dashboard with improved charting graphics and optimized to show strategic information like Process Efficiency and User Efficiency indicators.", + "enabled" => false, + "id" => "strategicDashboards", + "latest_version" => "", + "log" => null, + "name" => "strategicDashboards", + "nick" => "Strategic Dashboards", + "progress" => 0, + "publisher" => "Colosa", + "release_type" => "localRegistry", + "status" => "ready", + "store" => "00000000000000000000000000010006", + "type" => "features", + "url" => "", + "version" => "" + ) + ); private static $instancefeature = null; @@ -87,6 +140,132 @@ class PMLicensedFeatures $this->featuresDetails[$value[0]]->enabled = $enable; return $enable; } + + public function addNewFeatures ($data) + { + $newFeaturesList = $this->newFeatures; + $newData = array(); + $newFeaturesIds = array(); + foreach($newFeaturesList as $val) { + $newFeaturesIds[] = $val['id']; + } + $criteria = new Criteria(); + $criteria->addSelectColumn(AddonsManagerPeer::ADDON_ID); + $criteria->add(AddonsManagerPeer::ADDON_ID, $newFeaturesIds, Criteria::IN); + $criteria->add(AddonsManagerPeer::ADDON_TYPE, 'features'); + $rs = AddonsManagerPeer::doSelectRS($criteria); + $rs->next(); + $row = $rs->getRow(); + if(sizeof($row)) { + while (is_array($row)) { + $ids[] = $row[0]; + $rs->next(); + $row = $rs->getRow(); + } + $toUpdate = array_diff($newFeaturesIds,$ids); + + if(sizeof($toUpdate)){ + $newFeaturesListAux = array(); + foreach($toUpdate as $index => $v) { + $newFeaturesListAux[] = $newFeaturesList[$index]; + } + unset($newFeaturesList); + $newFeaturesList = array_values($newFeaturesListAux); + } else { + return $data; + } + } + + foreach($newFeaturesList as $k => $newFeature){ + $newData[] = array ( + 'db' => 'wf', + 'table' => 'ADDONS_MANAGER', + 'keys' => + array ( + 0 => 'ADDON_ID', + ), + 'data' => + array ( + 0 => + array ( + 'field' => 'ADDON_DESCRIPTION', + 'type' => 'text', + 'value' => $newFeature['description'], + ), + 1 => + array ( + 'field' => 'ADDON_ID', + 'type' => 'text', + 'value' => $newFeature['id'], + ), + 2 => + array ( + 'field' => 'ADDON_NAME', + 'type' => 'text', + 'value' => $newFeature['name'], + ), + 3 => + array ( + 'field' => 'ADDON_NICK', + 'type' => 'text', + 'value' => $newFeature['nick'], + ), + 4 => + array ( + 'field' => 'ADDON_PUBLISHER', + 'type' => 'text', + 'value' => $newFeature['publisher'], + ), + 5 => + array ( + 'field' => 'ADDON_RELEASE_TYPE', + 'type' => 'text', + 'value' => $newFeature['release_type'], + ), + 6 => + array ( + 'field' => 'ADDON_STATUS', + 'type' => 'text', + 'value' => $newFeature['status'], + ), + 7 => + array ( + 'field' => 'STORE_ID', + 'type' => 'text', + 'value' => $newFeature['store'], + ), + 8 => + array ( + 'field' => 'ADDON_TYPE', + 'type' => 'text', + 'value' => $newFeature['type'], + ), + 9 => + array ( + 'field' => 'ADDON_DOWNLOAD_URL', + 'type' => 'text', + 'value' => $newFeature['url'], + ), + 10 => + array ( + 'field' => 'ADDON_VERSION', + 'type' => 'text', + 'value' => $newFeature['version'], + ), + 11 => + array ( + 'field' => 'ADDON_DOWNLOAD_PROGRESS', + 'type' => 'text', + 'value' => $newFeature['progress'], + ) + ), + 'action' => 1, + ); + + $i++; + } + return array_merge($data, $newData); + } /*----------------------------------********---------------------------------*/ } diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index 828c01560..e801bb228 100755 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -912,6 +912,10 @@ class workspaceTools if (file_exists(PATH_CORE . 'data' . PATH_SEP . 'check.data')) { $checkData = unserialize(file_get_contents(PATH_CORE . 'data' . PATH_SEP . 'check.data')); if (is_array($checkData)) { + /*----------------------------------********---------------------------------*/ + $licensedFeatures = & PMLicensedFeatures::getSingleton(); + $checkData = $licensedFeatures->addNewFeatures($checkData); + /*----------------------------------********---------------------------------*/ foreach ($checkData as $checkThis) { $this->updateThisRegistry($checkThis); } diff --git a/workflow/engine/templates/enterprise/addonsStore.js b/workflow/engine/templates/enterprise/addonsStore.js index 5a265e9df..898899bb1 100644 --- a/workflow/engine/templates/enterprise/addonsStore.js +++ b/workflow/engine/templates/enterprise/addonsStore.js @@ -1443,54 +1443,6 @@ Ext.onReady(function() { } return ''; } - }, - { - id : "status-feature", - header : _('ID_STATUS'), - width : 60, - sortable : false, - hideable : false, - dataIndex: "status", - renderer: function (val) { - var str = ""; - var text = ""; - - switch (val) { - case "available": text = _('ID_BUY_NOW'); break; - case "installed": text = _('ID_INSTALLED'); break; - case "ready": text = _('ID_INSTALL_NOW'); break; - case "upgrade": text = _('ID_UPGRADE_NOW'); break; - case "download": text = _('ID_CANCEL'); break; - case "install": text = _('ID_INSTALLING'); break; - case "cancel": text = _('ID_CANCELLING'); break; - case "disabled": text = _('ID_DISABLED'); break; - case "download-start": text = ""; break; - default: text = val; break; - } - - switch (val) { - case "available": - case "ready": - case "upgrade": - case "download": - case "install": - case "cancel": - case "download-start": - str = "
" + text + "
"; - break; - - case "installed": - case "disabled": - str = "
" + text + "
"; - break; - - default: - str = "
" + text + "
"; - break; - } - - return (str); - } } ] }); From ff86ff1743c20e15a5633c51df702adf39a670be Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Thu, 16 Apr 2015 16:33:15 -0400 Subject: [PATCH 02/10] PM-2314,PM-2331 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PM-2314,En ADMIN > Plugins > Enterprise features el status del actionByEmail y el pmConsolidatedCL es "Install now" y este deberíestar como Installed y estas opciones ya deberí estar instaladas PM-2331,Admin/Plugins/Enterprise Features -> Eliminar columna de status en listado de features Dentro el tab "Enterprise features" se quito la columna status (PM-2331), Se agregaran los new features al ejecutar en consola ./processmaker databa-upgrade(PM-2314), --- .../engine/classes/class.licensedFeatures.php | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/workflow/engine/classes/class.licensedFeatures.php b/workflow/engine/classes/class.licensedFeatures.php index 16982bb7a..813d49d7e 100644 --- a/workflow/engine/classes/class.licensedFeatures.php +++ b/workflow/engine/classes/class.licensedFeatures.php @@ -78,6 +78,74 @@ class PMLicensedFeatures "type" => "features", "url" => "", "version" => "" + ), + 3 => array( + "description" => "Enables the configuration of a second database connection in order to divide the database requests in read and write operations. This features is used with database clusters to improve the application performance.", + "enabled" => false, + "id" => "secondDatabaseConnection", + "latest_version" => "", + "log" => null, + "name" => "secondDatabaseConnection", + "nick" => "secondDatabaseConnection", + "progress" => 0, + "publisher" => "Colosa", + "release_type" => "localRegistry", + "status" => "ready", + "store" => "00000000000000000000000000010000", + "type" => "features", + "url" => "", + "version" => "" + ), + 4 => array( + "description" => "Registers every admin action in a log. The actions in administration settings options are registered in the log.", + "enabled" => false, + "id" => "auditLog", + "latest_version" => "", + "log" => null, + "name" => "auditLog", + "nick" => "auditLog", + "progress" => 0, + "publisher" => "Colosa", + "release_type" => "localRegistry", + "status" => "ready", + "store" => "00000000000000000000000000010001", + "type" => "features", + "url" => "", + "version" => "" + ), + 5 => array( + "description" => "A more secure option to store user passwords in ProcessMaker. The modern algorithm SHA-2 is used to store the passwords.", + "enabled" => false, + "id" => "secureUserPasswordHash", + "latest_version" => "", + "log" => null, + "name" => "secureUserPasswordHash", + "nick" => "secureUserPasswordHash", + "progress" => 0, + "publisher" => "Colosa", + "release_type" => "localRegistry", + "status" => "ready", + "store" => "00000000000000000000000000010002", + "type" => "features", + "url" => "", + "version" => "" + ), + 6 => array( + "description" => "This functionality enables the flexibility to send mails from different email servers or configurations.", + "enabled" => false, + "id" => "sendEmailFromDifferentEmailServers", + "latest_version" => "", + "log" => null, + "name" => "sendEmailFromDifferentEmailServers", + "nick" => "sendEmailFromDifferentEmailServers", + "progress" => 0, + "publisher" => "Colosa", + "release_type" => "localRegistry", + "status" => "ready", + "store" => "00000000000000000000000000010003", + "type" => "features", + "url" => "", + "version" => "" ) ); From fd0905a2cb6dd676b7c6dff337db49f3260d1422 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Fri, 17 Apr 2015 12:17:20 -0400 Subject: [PATCH 03/10] =?UTF-8?q?PM-2313=200017153:=20Always=20dropping=20?= =?UTF-8?q?database=20when=20creating=20a=20new=20site=20from=20install/ne?= =?UTF-8?q?wSite.=20Causa=20:=20Fue=20definida=20asi,=20y=20siempre=20haci?= =?UTF-8?q?a=20drop=20de=20bases=20de=20datos.=20Soluci=C3=B3=20Aunque=20d?= =?UTF-8?q?esde=20la=20interfaz=20siempre=20se=20verificaba=20la=20base=20?= =?UTF-8?q?de=20datos=20si=20existia=20sin=20embargo=20onternamente=20se?= =?UTF-8?q?=20hacia=20un=20drop=20de=20esa=20base=20de=20datos.=20Se=20val?= =?UTF-8?q?ido=20esto=20con=20el=20cual=20se=20controla=20ese=20comportami?= =?UTF-8?q?ento.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/templates/setup/newSite.js | 25 +++++++++++-------- .../xmlform/login/forgotPasswordpm3.xml | 2 +- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/workflow/engine/templates/setup/newSite.js b/workflow/engine/templates/setup/newSite.js index 17682f224..badfc12e5 100755 --- a/workflow/engine/templates/setup/newSite.js +++ b/workflow/engine/templates/setup/newSite.js @@ -198,20 +198,23 @@ Ext.onReady(function(){ function createNW(nwTitle, aoDbWf, aoDbRb, aoDbRp, nwUsername, nwPassword, nwPassword2){ PMExt.confirm(_('ID_CONFIRM'), _('NEW_SITE_CONFIRM_TO_CREATE'), function(){ var loadMask = new Ext.LoadMask(document.body, {msg : _('ID_SITE_CREATING')}); + var oParams = { + action : 'create', + NW_TITLE : nwTitle, + AO_DB_WF : aoDbWf, + AO_DB_RB : aoDbRb, + AO_DB_RP : aoDbRp, + NW_USERNAME : nwUsername, + NW_PASSWORD : nwPassword, + NW_PASSWORD2 : nwPassword2 + }; + if(aoDbDrop){ + oParams.AO_DB_DROP = 'On'; + } loadMask.show(); Ext.Ajax.request({ url: '../newSiteProxy/testingNW', - params: { - action : 'create', - NW_TITLE : nwTitle, - AO_DB_WF : aoDbWf, - AO_DB_RB : aoDbRb, - AO_DB_RP : aoDbRp, - NW_USERNAME : nwUsername, - NW_PASSWORD : nwPassword, - NW_PASSWORD2 : nwPassword2, - AO_DB_DROP : aoDbDrop - }, + params: oParams, method: 'POST', success: function ( result, request ) { loadMask.hide(); diff --git a/workflow/engine/xmlform/login/forgotPasswordpm3.xml b/workflow/engine/xmlform/login/forgotPasswordpm3.xml index 1c148713a..87021af92 100755 --- a/workflow/engine/xmlform/login/forgotPasswordpm3.xml +++ b/workflow/engine/xmlform/login/forgotPasswordpm3.xml @@ -6,7 +6,7 @@ - + From f76826fefba73e3d8c46a0b24a844c8221d3b14c Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Fri, 17 Apr 2015 12:38:37 -0400 Subject: [PATCH 04/10] PM-2314,PM-2331 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PM-2314,En ADMIN > Plugins > Enterprise features el status del actionByEmail y el pmConsolidatedCL es "Install now" y este deberíestar como Installed y estas opciones ya deberí estar instaladas PM-2331,Admin/Plugins/Enterprise Features -> Eliminar columna de status en listado de features Dentro el tab "Enterprise features" se quito la columna status (PM-2331), Se agregaran los new features al ejecutar en consola ./processmaker databa-upgrade(PM-2314) --- workflow/engine/classes/class.licensedFeatures.php | 4 ++-- workflow/engine/data/mysql/insert.sql | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/class.licensedFeatures.php b/workflow/engine/classes/class.licensedFeatures.php index 813d49d7e..dcf2161bb 100644 --- a/workflow/engine/classes/class.licensedFeatures.php +++ b/workflow/engine/classes/class.licensedFeatures.php @@ -29,7 +29,7 @@ class PMLicensedFeatures private $features = array (); private $newFeatures = array( 0 => array( - "description" => "Enables de Actions By Email feature", + "description" => "Enables de Actions By Email feature.", "enabled" => false, "id" => "actionsByEmail", "latest_version" => "", @@ -46,7 +46,7 @@ class PMLicensedFeatures "version" => "" ), 1 => array( - "description" => "Enables de Batch Routing feature", + "description" => "Enables de Batch Routing feature.", "enabled" => false, "id" => "pmConsolidatedCL", "latest_version" => "", diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 4a9996c20..9d8b25c9e 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -59981,3 +59981,12 @@ INSERT INTO CATALOG (CAT_UID, CAT_LABEL_ID, CAT_TYPE, CAT_FLAG, CAT_OBSERVATION, ('1060','ID_NEW_CASES','INDICATOR','','','2015-03-04','2015-03-04'), ('1070','ID_COMPLETED_CASES','INDICATOR','','','2015-03-04','2015-03-04'), ('1080','ID_WORKING_CASES','INDICATOR','','','2015-03-04','2015-03-04'); + +INSERT INTO ADDONS_MANAGER (ADDON_DESCRIPTION,ADDON_ID,ADDON_NAME,ADDON_NICK,ADDON_PUBLISHER,ADDON_RELEASE_TYPE,ADDON_STATUS,STORE_ID,ADDON_TYPE,ADDON_DOWNLOAD_URL,ADDON_VERSION,ADDON_DOWNLOAD_PROGRESS) VALUES +('Enables de Actions By Email feature.','actionsByEmail','actionsByEmail','actionsByEmail','Colosa','localRegistry','ready','00000000000000000000000000010004','features','','','0'); +('Enables de Batch Routing feature.','pmConsolidatedCL','pmConsolidatedCL','pmConsolidatedCL','Colosa','localRegistry','ready','00000000000000000000000000010005','features','','','0'); +('Dashboard with improved charting graphics and optimized to show strategic information like Process Efficiency and User Efficiency indicators.','strategicDashboards','strategicDashboards','Strategic Dashboards','Colosa','localRegistry','ready','00000000000000000000000000010006','features','','','0'); +('Enables the configuration of a second database connection in order to divide the database requests in read and write operations. This features is used with database clusters to improve the application performance.','secondDatabaseConnection','secondDatabaseConnection','secondDatabaseConnection','Colosa','localRegistry','ready','00000000000000000000000000010000','features','','','0'); +('A more secure option to store user passwords in ProcessMaker. The modern algorithm SHA-2 is used to store the passwords.','secureUserPasswordHash','secureUserPasswordHash','secureUserPasswordHash','Colosa','localRegistry','ready','00000000000000000000000000010002','features','','','0'); +('This functionality enables the flexibility to send mails from different email servers or configurations.','sendEmailFromDifferentEmailServers','sendEmailFromDifferentEmailServers','sendEmailFromDifferentEmailServers','Colosa','localRegistry','ready','00000000000000000000000000010003','features','','','0'); +('Registers every admin action in a log. The actions in administration settings options are registered in the log.','auditLog','auditLog','auditLog','Colosa','localRegistry','ready','00000000000000000000000000010001','features','','','0'); From ffd93998d266ab4f432627f256cb9c5827b21b18 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Fri, 17 Apr 2015 12:59:00 -0400 Subject: [PATCH 05/10] =?UTF-8?q?PM-2313=200017153:=20Always=20dropping=20?= =?UTF-8?q?database=20when=20creating=20a=20new=20site=20from=20install/ne?= =?UTF-8?q?wSite.=20Causa=20:=20Fue=20definida=20asi,=20y=20siempre=20haci?= =?UTF-8?q?a=20drop=20de=20bases=20de=20datos.=20Soluci=C3=B3=20Aunque=20d?= =?UTF-8?q?esde=20la=20interfaz=20siempre=20se=20verificaba=20la=20base=20?= =?UTF-8?q?de=20datos=20si=20existia=20sin=20embargo=20onternamente=20se?= =?UTF-8?q?=20hacia=20un=20drop=20de=20esa=20base=20de=20datos.=20Se=20val?= =?UTF-8?q?ido=20esto=20con=20el=20cual=20se=20controla=20ese=20comportami?= =?UTF-8?q?ento.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/xmlform/login/forgotPasswordpm3.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/xmlform/login/forgotPasswordpm3.xml b/workflow/engine/xmlform/login/forgotPasswordpm3.xml index 87021af92..d73523a91 100755 --- a/workflow/engine/xmlform/login/forgotPasswordpm3.xml +++ b/workflow/engine/xmlform/login/forgotPasswordpm3.xml @@ -6,7 +6,7 @@ - + From 633f4fe9c4cb92275152d6ffa5e2f43870df160c Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Fri, 17 Apr 2015 13:04:20 -0400 Subject: [PATCH 06/10] PM-2314,PM-2331 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PM-2314,En ADMIN > Plugins > Enterprise features el status del actionByEmail y el pmConsolidatedCL es "Install now" y este deberíestar como Installed y estas opciones ya deberí estar instaladas PM-2331,Admin/Plugins/Enterprise Features -> Eliminar columna de status en listado de features Dentro el tab "Enterprise features" se quito la columna status (PM-2331), Se agregaran los new features al ejecutar en consola ./processmaker databa-upgrade(PM-2314) --- workflow/engine/data/mysql/insert.sql | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 9d8b25c9e..fbb333b5e 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -59983,10 +59983,10 @@ INSERT INTO CATALOG (CAT_UID, CAT_LABEL_ID, CAT_TYPE, CAT_FLAG, CAT_OBSERVATION, ('1080','ID_WORKING_CASES','INDICATOR','','','2015-03-04','2015-03-04'); INSERT INTO ADDONS_MANAGER (ADDON_DESCRIPTION,ADDON_ID,ADDON_NAME,ADDON_NICK,ADDON_PUBLISHER,ADDON_RELEASE_TYPE,ADDON_STATUS,STORE_ID,ADDON_TYPE,ADDON_DOWNLOAD_URL,ADDON_VERSION,ADDON_DOWNLOAD_PROGRESS) VALUES -('Enables de Actions By Email feature.','actionsByEmail','actionsByEmail','actionsByEmail','Colosa','localRegistry','ready','00000000000000000000000000010004','features','','','0'); -('Enables de Batch Routing feature.','pmConsolidatedCL','pmConsolidatedCL','pmConsolidatedCL','Colosa','localRegistry','ready','00000000000000000000000000010005','features','','','0'); -('Dashboard with improved charting graphics and optimized to show strategic information like Process Efficiency and User Efficiency indicators.','strategicDashboards','strategicDashboards','Strategic Dashboards','Colosa','localRegistry','ready','00000000000000000000000000010006','features','','','0'); -('Enables the configuration of a second database connection in order to divide the database requests in read and write operations. This features is used with database clusters to improve the application performance.','secondDatabaseConnection','secondDatabaseConnection','secondDatabaseConnection','Colosa','localRegistry','ready','00000000000000000000000000010000','features','','','0'); -('A more secure option to store user passwords in ProcessMaker. The modern algorithm SHA-2 is used to store the passwords.','secureUserPasswordHash','secureUserPasswordHash','secureUserPasswordHash','Colosa','localRegistry','ready','00000000000000000000000000010002','features','','','0'); -('This functionality enables the flexibility to send mails from different email servers or configurations.','sendEmailFromDifferentEmailServers','sendEmailFromDifferentEmailServers','sendEmailFromDifferentEmailServers','Colosa','localRegistry','ready','00000000000000000000000000010003','features','','','0'); +('Enables de Actions By Email feature.','actionsByEmail','actionsByEmail','actionsByEmail','Colosa','localRegistry','ready','00000000000000000000000000010004','features','','','0'), +('Enables de Batch Routing feature.','pmConsolidatedCL','pmConsolidatedCL','pmConsolidatedCL','Colosa','localRegistry','ready','00000000000000000000000000010005','features','','','0'), +('Dashboard with improved charting graphics and optimized to show strategic information like Process Efficiency and User Efficiency indicators.','strategicDashboards','strategicDashboards','Strategic Dashboards','Colosa','localRegistry','ready','00000000000000000000000000010006','features','','','0'), +('Enables the configuration of a second database connection in order to divide the database requests in read and write operations. This features is used with database clusters to improve the application performance.','secondDatabaseConnection','secondDatabaseConnection','secondDatabaseConnection','Colosa','localRegistry','ready','00000000000000000000000000010000','features','','','0'), +('A more secure option to store user passwords in ProcessMaker. The modern algorithm SHA-2 is used to store the passwords.','secureUserPasswordHash','secureUserPasswordHash','secureUserPasswordHash','Colosa','localRegistry','ready','00000000000000000000000000010002','features','','','0'), +('This functionality enables the flexibility to send mails from different email servers or configurations.','sendEmailFromDifferentEmailServers','sendEmailFromDifferentEmailServers','sendEmailFromDifferentEmailServers','Colosa','localRegistry','ready','00000000000000000000000000010003','features','','','0'), ('Registers every admin action in a log. The actions in administration settings options are registered in the log.','auditLog','auditLog','auditLog','Colosa','localRegistry','ready','00000000000000000000000000010001','features','','','0'); From 7cae1c26ff5e90951e1c9306182f128169d5c7e0 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Fri, 17 Apr 2015 14:34:29 -0400 Subject: [PATCH 07/10] =?UTF-8?q?PM-2313=200017153:=20Always=20dropping=20?= =?UTF-8?q?database=20when=20creating=20a=20new=20site=20from=20install/ne?= =?UTF-8?q?wSite.=20Causa=20:=20Fue=20definida=20asi,=20y=20siempre=20haci?= =?UTF-8?q?a=20drop=20de=20bases=20de=20datos.=20Soluci=C3=B3=20Aunque=20d?= =?UTF-8?q?esde=20la=20interfaz=20siempre=20se=20verificaba=20la=20base=20?= =?UTF-8?q?de=20datos=20si=20existia=20sin=20embargo=20onternamente=20se?= =?UTF-8?q?=20hacia=20un=20drop=20de=20esa=20base=20de=20datos.=20Se=20val?= =?UTF-8?q?ido=20esto=20con=20el=20cual=20se=20controla=20ese=20comportami?= =?UTF-8?q?ento.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/xmlform/login/forgotPasswordpm3.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/xmlform/login/forgotPasswordpm3.xml b/workflow/engine/xmlform/login/forgotPasswordpm3.xml index d73523a91..204c4d134 100755 --- a/workflow/engine/xmlform/login/forgotPasswordpm3.xml +++ b/workflow/engine/xmlform/login/forgotPasswordpm3.xml @@ -6,7 +6,7 @@ - + From eef845727efe39e272ab1f537e02445fdd34b858 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Fri, 17 Apr 2015 14:57:53 -0400 Subject: [PATCH 08/10] I solved the issue PM-2336 [Error con el Consolidated tab] --- workflow/engine/classes/class.processMap.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php index 3d65399c7..7dd4742f1 100755 --- a/workflow/engine/classes/class.processMap.php +++ b/workflow/engine/classes/class.processMap.php @@ -1588,8 +1588,9 @@ class processMap $numRows = DynaformPeer::doCount($oCriteria); if ($numRows == 0) { - echo "
".G::LoadTranslation('ID_ALERT')."
".G::LoadTranslation('ID_CONSOLIDATED_DYNAFORM_REQUIRED')."
"; - die; + $aFields['TITLE_ALERT'] = G::LoadTranslation('ID_ALERT'); + $aFields['SUBTITLE_MESSAGE'] = G::LoadTranslation('ID_CONSOLIDATED_DYNAFORM_REQUIRED'); + $sFilename = 'tasks/tasks_Consolidated_Error.xml'; } } From 197a1d571098ebfe78ad98dcdb6e7f296ca54a1a Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Fri, 17 Apr 2015 15:03:52 -0400 Subject: [PATCH 09/10] I added new form by show Consolitated Error --- .../tasks/tasks_Consolidated_Error.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 workflow/engine/xmlform/tasks/tasks_Consolidated_Error.xml diff --git a/workflow/engine/xmlform/tasks/tasks_Consolidated_Error.xml b/workflow/engine/xmlform/tasks/tasks_Consolidated_Error.xml new file mode 100644 index 000000000..7c449fe4d --- /dev/null +++ b/workflow/engine/xmlform/tasks/tasks_Consolidated_Error.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 8e9253d9cc0bda869fa3bf90b72677a4c46c71cb Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Fri, 17 Apr 2015 15:34:51 -0400 Subject: [PATCH 10/10] I solved the issue with Timing control --- workflow/engine/methods/cases/cases_Step.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php index df4224e1e..f3af8eb91 100755 --- a/workflow/engine/methods/cases/cases_Step.php +++ b/workflow/engine/methods/cases/cases_Step.php @@ -908,7 +908,7 @@ try { $daysSelected = "selected = 'selected'"; } - $sAux = ''; @@ -921,7 +921,7 @@ try { $calendarSelected = "selected = 'selected'"; } - $sAux = '';