fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'upstream/release/3.2.1' into bugfix/HOR-3017

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-05-04 08:34:24 -04:00
parent 46a5f639a2 537d826de8
commit edeea2eb98
15 changed files with 135 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEvent.php
View File

@@ -996,4 +996,24 @@ class WebEntryEvent
throw $e;
}
}
/**
* This function verify if a user $userUid was configure in a Web Entry and return the total of records
*
* @param string $userUid uid of a user
*
* return integer $total
*/
public function getWebEntryRelatedToUser($userUid)
{
try {
//Get data
$criteria = $this->getWebEntryEventCriteria();
$criteria->add(\WebEntryEventPeer::USR_UID, $userUid, \Criteria::EQUAL);
$total = \WebEntryEventPeer::doCount($criteria);
return $total;
} catch (\Exception $e) {
throw $e;
}
}
}

4
workflow/engine/src/ProcessMaker/Services/Api/Project/OutputDocuments.php
View File

@@ -78,10 +78,10 @@ class OutputDocuments extends Api
*
* @param string $prjUid {@min 32} {@max 32}
* @param string $outputDocumentUid {@min 32} {@max 32}
* @param OutputDocumentStructure $request_data
* @param array $request_data
*
*/
public function doPutProjectOutputDocument($prjUid, $outputDocumentUid, OutputDocumentStructure $request_data)
public function doPutProjectOutputDocument($prjUid, $outputDocumentUid, $request_data)
{
try {
$request_data = (array)($request_data);