fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in victorsl/processmaker (pull request #640)

Browse Source 
ProcessMaker-BE "Correccion de bugs (web entry, project user)"
This commit is contained in:
Erik Amaru Ortiz
2014-08-06 10:16:46 -04:00
parent 749d3bfa61 8e6d8f7a80
commit 0e3d77f194
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/src/ProcessMaker/BusinessModel/ProjectUser.php
View File

@@ -34,7 +34,6 @@ class ProjectUser
$oCriteria->addJoin(\TaskUserPeer::TAS_UID, \TaskPeer::TAS_UID, \Criteria::LEFT_JOIN); $oCriteria->addJoin(\TaskUserPeer::TAS_UID, \TaskPeer::TAS_UID, \Criteria::LEFT_JOIN);
$oCriteria->add(\TaskPeer::PRO_UID, $sProcessUID); $oCriteria->add(\TaskPeer::PRO_UID, $sProcessUID);
$oCriteria->add(\TaskUserPeer::TU_TYPE, 1); $oCriteria->add(\TaskUserPeer::TU_TYPE, 1);
$oCriteria->addGroupByColumn(\TaskUserPeer::USR_UID);
$oDataset = \TaskUserPeer::doSelectRS($oCriteria); $oDataset = \TaskUserPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
@@ -148,7 +147,6 @@ class ProjectUser
'act_uid' => $task['uid']); 'act_uid' => $task['uid']);
} }
} }
$oDataset->next();
} }
$new = array(); $new = array();
$exclude = array(""); $exclude = array("");

2
workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
View File

@@ -110,7 +110,7 @@ class WebEntry
$newName = str_replace($arraySpecialCharSearch, $arraySpecialCharReplace, $name); $newName = str_replace($arraySpecialCharSearch, $arraySpecialCharReplace, $name);
$arraySpecialCharSearch = array("/[\!-\)\:-\@]/", "/[\{\}\[\]\¿\?\+]/"); $arraySpecialCharSearch = array("/[\!-\)\:-\@]/", "/[\{\}\[\]\|\¿\?\+\*]/");
$arraySpecialCharReplace = array("", ""); $arraySpecialCharReplace = array("", "");
$newName = preg_replace($arraySpecialCharSearch, $arraySpecialCharReplace, $newName); $newName = preg_replace($arraySpecialCharSearch, $arraySpecialCharReplace, $newName);