fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-3682

Browse Source 
Fix problem generated by password hidding.
This commit is contained in:
davidcallizaya
2017-08-11 12:14:43 -04:00
parent 211da8bc50
commit f5430f2027
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rbac/engine/classes/model/RbacUsers.php
View File

@@ -184,9 +184,10 @@ class RbacUsers extends BaseRbacUsers
try { try {
$c = new Criteria('rbac'); $c = new Criteria('rbac');
$c->add(RbacUsersPeer::USR_UID, $sUsrUid); $c->add(RbacUsersPeer::USR_UID, $sUsrUid);
$rs = RbacUsersPeer::doSelect($c, Propel::getDbConnection('rbac_ro')); $resultSet = RbacUsersPeer::doSelectRS($c, Propel::getDbConnection('rbac_ro'));
if (is_array($rs) && isset($rs[0]) && is_object($rs[0]) && get_class($rs[0]) == 'RbacUsers') { if ($resultSet->next()) {
$aFields = $rs[0]->toArray(BasePeer::TYPE_FIELDNAME); $this->hydrate($resultSet);
$aFields = $this->toArray(BasePeer::TYPE_FIELDNAME);
return $aFields; return $aFields;
} }
return false; return false;
@@ -326,10 +327,14 @@ class RbacUsers extends BaseRbacUsers
* *
* @param string $keyType One of the class type constants TYPE_PHPNAME, * @param string $keyType One of the class type constants TYPE_PHPNAME,
* TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM * TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM
* @param boolean $original If true return de original verion of fields.
* @return an associative array containing the field names (as keys) and field values * @return an associative array containing the field names (as keys) and field values
*/ */
public function toArray($keyType = BasePeer::TYPE_PHPNAME) public function toArray($keyType = BasePeer::TYPE_PHPNAME, $original = false)
{ {
if ($original) {
return parent::toArray($keyType);
}
$key = RbacUsersPeer::translateFieldName( $key = RbacUsersPeer::translateFieldName(
RbacUsersPeer::USR_PASSWORD, RbacUsersPeer::USR_PASSWORD,
BasePeer::TYPE_COLNAME, BasePeer::TYPE_COLNAME,

11
workflow/engine/classes/model/Users.php
View File

@@ -83,8 +83,11 @@ class Users extends BaseUsers
try { try {
$oRow = UsersPeer::retrieveByPK( $UsrUid ); $oRow = UsersPeer::retrieveByPK( $UsrUid );
if (! is_null( $oRow )) { if (! is_null( $oRow )) {
$this->fromArray(
$oRow->toArray( BasePeer::TYPE_FIELDNAME, true ),
BasePeer::TYPE_FIELDNAME
);
$aFields = $oRow->toArray( BasePeer::TYPE_FIELDNAME ); $aFields = $oRow->toArray( BasePeer::TYPE_FIELDNAME );
$this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME );
$this->setNew( false ); $this->setNew( false );
return $aFields; return $aFields;
} else { } else {
@@ -496,10 +499,14 @@ class Users extends BaseUsers
* *
* @param string $keyType One of the class type constants TYPE_PHPNAME, * @param string $keyType One of the class type constants TYPE_PHPNAME,
* TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM * TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM
* @param boolean $original If true return de original verion of fields.
* @return an associative array containing the field names (as keys) and field values * @return an associative array containing the field names (as keys) and field values
*/ */
public function toArray($keyType = BasePeer::TYPE_PHPNAME) public function toArray($keyType = BasePeer::TYPE_PHPNAME, $original = false)
{ {
if ($original) {
return parent::toArray($keyType);
}
$key = UsersPeer::translateFieldName( $key = UsersPeer::translateFieldName(
UsersPeer::USR_PASSWORD, UsersPeer::USR_PASSWORD,
BasePeer::TYPE_COLNAME, BasePeer::TYPE_COLNAME,