fernando/luos
1
0
Fork 0
Code Releases Activity

Improvements in user login and process import

Browse Source
This commit is contained in:
Julio Cesar Laura
2013-04-15 16:10:57 -04:00
parent 03596f504b
commit d612d015d0
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workflow/engine/classes/class.processes.php
View File

@@ -2426,12 +2426,14 @@ class Processes
*/ */
public function createTaskUserRows ($aTaskUser) public function createTaskUserRows ($aTaskUser)
{ {
foreach ($aTaskUser as $key => $row) { if (is_array($aTaskUser)) {
$oTaskUser = new TaskUser(); foreach ($aTaskUser as $key => $row) {
if ($oTaskUser->TaskUserExists( $row['TAS_UID'], $row['USR_UID'], $row['TU_TYPE'], $row['TU_RELATION'] )) { $oTaskUser = new TaskUser();
$oTaskUser->remove( $row['TAS_UID'], $row['USR_UID'], $row['TU_TYPE'], $row['TU_RELATION'] ); if ($oTaskUser->TaskUserExists( $row['TAS_UID'], $row['USR_UID'], $row['TU_TYPE'], $row['TU_RELATION'] )) {
$oTaskUser->remove( $row['TAS_UID'], $row['USR_UID'], $row['TU_TYPE'], $row['TU_RELATION'] );
}
$res = $oTaskUser->create( $row );
} }
$res = $oTaskUser->create( $row );
} }
return; return;
} }

4
workflow/engine/methods/users/usersAjax.php
View File

@@ -130,7 +130,7 @@ switch ($_POST['action']) {
if ($form['USR_UID'] == '') { if ($form['USR_UID'] == '') {
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(UsersPeer::USR_USERNAME); $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
$criteria->add(UsersPeer::USR_USERNAME, $_POST['USR_USERNAME']); $criteria->add(UsersPeer::USR_USERNAME, utf8_encode($_POST['USR_USERNAME']));
if (UsersPeer::doCount($criteria) > 0) { if (UsersPeer::doCount($criteria) > 0) {
throw new Exception(G::LoadTranslation('ID_USERNAME_ALREADY_EXISTS', array('USER_ID' => $_POST['USR_USERNAME']))); throw new Exception(G::LoadTranslation('ID_USERNAME_ALREADY_EXISTS', array('USER_ID' => $_POST['USR_USERNAME'])));
} }
@@ -584,7 +584,7 @@ switch ($_POST['action']) {
$oCriteria = new Criteria(); $oCriteria = new Criteria();
$oCriteria->addSelectColumn(UsersPeer::USR_USERNAME); $oCriteria->addSelectColumn(UsersPeer::USR_USERNAME);
$oCriteria->add(UsersPeer::USR_USERNAME, $_POST['NEW_USERNAME']); $oCriteria->add(UsersPeer::USR_USERNAME, utf8_encode($_POST['NEW_USERNAME']));
if ($USR_UID != '') { if ($USR_UID != '') {
$oCriteria->add(UsersPeer::USR_UID, array($_POST['USR_UID']), Criteria::NOT_IN); $oCriteria->add(UsersPeer::USR_UID, array($_POST['USR_UID']), Criteria::NOT_IN);
} }