fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in cochalo/processmaker (pull request #521)

Browse Source 
Correcion de op_action adicionando RESEND
This commit is contained in:
Erik Amaru Ortiz
2014-06-05 08:59:50 -04:00
parent 55e5ff9024 9599e657e7
commit b4154bf562
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/src/ProcessMaker/BusinessModel/CaseScheduler.php
View File

@@ -151,6 +151,7 @@ class CaseScheduler
$criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\CaseSchedulerPeer::TAS_UID);
$criteria->add(\CaseSchedulerPeer::SCH_NAME, $name, \Criteria::EQUAL);
$criteria->add(\CaseSchedulerPeer::PRO_UID, $processUid, \Criteria::EQUAL);
$rsCriteria = \CaseSchedulerPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$rsCriteria->next();
@@ -168,13 +169,14 @@ class CaseScheduler
*
* return bool Return true if the name exists, false otherwise
*/
public function existsNameUpdate($schUid, $name)
public function existsNameUpdate($processUid, $schUid, $name)
{
try {
$criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\CaseSchedulerPeer::TAS_UID);
$criteria->add(\CaseSchedulerPeer::SCH_NAME, $name, \Criteria::EQUAL);
$criteria->add(\CaseSchedulerPeer::SCH_UID, $schUid, \Criteria::NOT_EQUAL);
$criteria->add(\CaseSchedulerPeer::PRO_UID, $processUid, \Criteria::EQUAL);
$rsCriteria = \CaseSchedulerPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$rsCriteria->next();
@@ -545,7 +547,7 @@ class CaseScheduler
if ($caseSchedulerData['SCH_NAME']=='') {
throw new \Exception(\G::LoadTranslation("ID_CAN_NOT_BE_EMPTY", array ('sch_name')));
}
if ($this->existsNameUpdate($sSchUID, $caseSchedulerData['SCH_NAME'])) {
if ($this->existsNameUpdate($sProcessUID, $sSchUID, $caseSchedulerData['SCH_NAME'])) {
throw new \Exception(\G::LoadTranslation("ID_CASE_SCHEDULER_DUPLICATE"));
}
$mUser = $this->getUser($caseSchedulerData['SCH_DEL_USER_NAME'], $caseSchedulerData['TAS_UID']);

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

@@ -68,7 +68,7 @@ class ProcessPermissions extends Api
* @param string $op_case_status {@from body} {@choice ALL,DRAFT,TO_DO,PAUSED,COMPLETED}
* @param string $op_participate {@from body} {@choice 0,1}
* @param string $op_obj_type {@from body} {@choice ANY,DYNAFORM,INPUT,OUTPUT,CASES_NOTES,MSGS_HISTORY}
* @param string $op_action {@from body} {@choice VIEW,BLOCK,DELETE}
* @param string $op_action {@from body} {@choice VIEW,BLOCK,DELETE,RESEND}
* @param string $tas_uid {@from body}
* @param string $op_task_source {@from body}
* @param string $dynaforms {@from body}
@@ -127,7 +127,7 @@ class ProcessPermissions extends Api
* @param string $op_case_status {@from body} {@choice ALL,DRAFT,TO_DO,PAUSED,COMPLETED}
* @param string $op_participate {@from body} {@choice 0,1}
* @param string $op_obj_type {@from body} {@choice ANY,DYNAFORM,INPUT,OUTPUT,CASES_NOTES,MSGS_HISTORY}
* @param string $op_action {@from body} {@choice VIEW,BLOCK,DELETE}
* @param string $op_action {@from body} {@choice VIEW,BLOCK,DELETE,RESEND}
* @param string $tas_uid {@from body}
* @param string $op_task_source {@from body}
* @param string $dynaforms {@from body}