fernando/luos
1
0
Fork 0
Code Releases Activity

Merged colosa/processmaker into master

Browse Source
This commit is contained in:
Quenta Ronald
2015-03-04 08:42:27 -04:00
parent 041c14bb44 1e40384db2
commit 62355aa02b
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/model/map/EmailServerMapBuilder.php
View File

@@ -79,9 +79,9 @@ class EmailServerMapBuilder
$tMap->addColumn('MESS_PASSWORD', 'MessPassword', 'string', CreoleTypes::VARCHAR, true, 256);
$tMap->addColumn('MESS_FROM_MAIL', 'MessFromMail', 'string', CreoleTypes::VARCHAR, true, 256);
$tMap->addColumn('MESS_FROM_MAIL', 'MessFromMail', 'string', CreoleTypes::VARCHAR, false, 256);
$tMap->addColumn('MESS_FROM_NAME', 'MessFromName', 'string', CreoleTypes::VARCHAR, true, 256);
$tMap->addColumn('MESS_FROM_NAME', 'MessFromName', 'string', CreoleTypes::VARCHAR, false, 256);
$tMap->addColumn('SMTPSECURE', 'Smtpsecure', 'string', CreoleTypes::VARCHAR, true, 3);

6
workflow/engine/config/schema.xml
View File

@@ -4030,7 +4030,7 @@
<column name="DEL_DUE_DATE" type="TIMESTAMP" required="false"/>
<column name="DEL_PRIORITY" type="VARCHAR" size="32" required="true" default="3"/>
<column name="DEL_THREAD_STATUS" type="VARCHAR" size="32" required="true" default="OPEN"/>
</table>
</table>
<table name="LIST_COMPLETED">
<vendor type="mysql">
<parameter name="Name" value="LIST_COMPLETED"/>
@@ -4336,8 +4336,8 @@
<column name="MESS_RAUTH" type="INTEGER" required="true" default="0" />
<column name="MESS_ACCOUNT" type="VARCHAR" size="256" required="true" default="" />
<column name="MESS_PASSWORD" type="VARCHAR" size="256" required="true" default="" />
<column name="MESS_FROM_MAIL" type="VARCHAR" size="256" required="true" default="" />
<column name="MESS_FROM_NAME" type="VARCHAR" size="256" required="true" default="" />
<column name="MESS_FROM_MAIL" type="VARCHAR" size="256" default="" />
<column name="MESS_FROM_NAME" type="VARCHAR" size="256" default="" />
<column name="SMTPSECURE" type="VARCHAR" size="3" required="true" default="No" />
<column name="MESS_TRY_SEND_INMEDIATLY" type="INTEGER" required="true" default="0" />
<column name="MAIL_TO" type="VARCHAR" size="256" required="true" default="" />

5
workflow/engine/data/mysql/schema.sql
View File

@@ -2483,7 +2483,6 @@ CREATE TABLE `MESSAGE_TYPE_VARIABLE`
DROP TABLE IF EXISTS `EMAIL_SERVER`;
CREATE TABLE `EMAIL_SERVER`
(
`MESS_UID` VARCHAR(32) default '' NOT NULL,
@@ -2493,8 +2492,8 @@ CREATE TABLE `EMAIL_SERVER`
`MESS_RAUTH` INTEGER default 0 NOT NULL,
`MESS_ACCOUNT` VARCHAR(256) default '' NOT NULL,
`MESS_PASSWORD` VARCHAR(256) default '' NOT NULL,
`MESS_FROM_MAIL` VARCHAR(256) default '' NOT NULL,
`MESS_FROM_NAME` VARCHAR(256) default '' NOT NULL,
`MESS_FROM_MAIL` VARCHAR(256) default '',
`MESS_FROM_NAME` VARCHAR(256) default '',
`SMTPSECURE` VARCHAR(3) default 'No' NOT NULL,
`MESS_TRY_SEND_INMEDIATLY` INTEGER default 0 NOT NULL,
`MAIL_TO` VARCHAR(256) default '' NOT NULL,

6
workflow/engine/methods/processes/processesList.php
View File

@@ -40,16 +40,16 @@ $memcacheUsed = 'not used';
$totalCount = 0;
if (isset( $_POST['category'] ) && $_POST['category'] !== '<reset>') {
if (isset( $_POST['processName'] ))
$proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category'], $_POST['processName']);
$proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category'], $_POST['processName'], true, false, $_SESSION["USER_LOGGED"]);
else
$proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category']);
$proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category'], null, true, false, $_SESSION["USER_LOGGED"]);
} else {
if (isset( $_POST['processName'] )) {
$memkey = 'processList-' . $start . '-' . $limit . '-' . $_POST['processName'];
$memcacheUsed = 'yes';
$proData = $memcache->get( $memkey );
if ($proData === false) {
$proData = $oProcess->getAllProcesses( $start, $limit, null, $_POST['processName']);
$proData = $oProcess->getAllProcesses( $start, $limit, null, $_POST['processName'], true, false, $_SESSION["USER_LOGGED"]);
$memcache->set( $memkey, $proData, PMmemcached::ONE_HOUR );
$totalCount = count($proData);
$proData = array_splice($proData, $start, $limit);