fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in dheeyi/processmaker/HOR-406 (pull request #3802)

Browse Source 
HOR-406
This commit is contained in:
Julio Cesar Laura Avendaño
2016-03-08 12:09:49 -04:00
parent b6b75ec818 8858757b52
commit 5767eb6c8b
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workflow/engine/classes/model/ListInbox.php
View File

@@ -482,6 +482,13 @@ class ListInbox extends BaseListInbox
return (int)$total;
}
/**
* @param $usr_uid
* @param array $filters
* @param null $callbackRecord
* @return array
* @throws PropelException
*/
public function loadList($usr_uid, $filters = array(), $callbackRecord = null)
{
$criteria = new Criteria();
@@ -505,6 +512,11 @@ class ListInbox extends BaseListInbox
$criteria->addSelectColumn(ListInboxPeer::DEL_INIT_DATE);
$criteria->addSelectColumn(ListInboxPeer::DEL_DUE_DATE);
$criteria->addSelectColumn(ListInboxPeer::DEL_PRIORITY);
$criteria->addSelectColumn(UsersPeer::USR_UID);
$criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
$criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
$criteria->addSelectColumn(UsersPeer::USR_USERNAME);
$criteria->addJoin( ListInboxPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN );
$criteria->add( ListInboxPeer::USR_UID, $usr_uid, Criteria::EQUAL );
self::loadFilters($criteria, $filters);

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

@@ -4030,6 +4030,15 @@
<column name="DEL_DUE_DATE" type="TIMESTAMP" required="false"/>
<column name="DEL_RISK_DATE" type="TIMESTAMP" required="false" />
<column name="DEL_PRIORITY" type="VARCHAR" size="32" required="true" default="3"/>
<index name="indexUser">
<index-column name="USR_UID"/>
<vendor type="mysql">
<parameter name="Table" value="LIST_INBOX"/>
<parameter name="Non_unique" value="1"/>
<parameter name="Key_name" value="indexUser"/>
<parameter name="Seq_in_index" value="1"/>
</vendor>
</index>
<index name="indexInboxUser">
<index-column name="USR_UID"/>
<index-column name="DEL_DELEGATE_DATE"/>

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

@@ -2263,6 +2263,7 @@ CREATE TABLE `LIST_INBOX`
`DEL_RISK_DATE` DATETIME,
`DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL,
PRIMARY KEY (`APP_UID`,`DEL_INDEX`),
KEY `indexUser`(`USR_UID`),
KEY `indexInboxUser`(`USR_UID`, `DEL_DELEGATE_DATE`),
KEY `indexInboxUserStatusUpdateDate`(`USR_UID`, `APP_STATUS`, `APP_UPDATE_DATE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Inbox list';

10
workflow/engine/src/ProcessMaker/Services/Api/Light.php
View File

@@ -285,11 +285,11 @@ class Light extends Api
'user' => array(
'USR_UID' => 'userId'
),
'prevUser' => array(
'PREVIOUS_USR_UID' => 'userId',
'PREVIOUS_USR_FIRSTNAME' => 'firstName',
'PREVIOUS_USR_LASTNAME' => 'lastName',
'PREVIOUS_USR_USERNAME' => 'fullName',
'currentUser' => array(
'USR_UID' => 'userId',
'USR_FIRSTNAME' => 'firstName',
'USR_LASTNAME' => 'lastName',
'USR_USERNAME' => 'fullName',
),
'process' => array(
'PRO_UID' => 'processId',