Merged in bugfix/HOR-3803 (pull request #6023)

HOR-3803

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Ronald Quenta
2017-08-28 15:32:02 +00:00
committed by Julio Cesar Laura Avendaño
2 changed files with 3 additions and 1 deletions

2
.gitignore vendored
View File

@@ -39,3 +39,5 @@ build-prod.zip
node_modules
/workflow/engine/config/system-tables.ini
test_shared/
**/cache/
storage/

View File

@@ -215,7 +215,6 @@ class Roles extends BaseRoles {
function createRole($aData) {
$con = Propel::getConnection(RolesPeer::DATABASE_NAME);
try {
$con->begin();
$sRolCode = $aData['ROL_CODE'];
$sRolSystem = $aData['ROL_SYSTEM'];
$status = $fields['ROL_STATUS'] = 1 ? 'ACTIVE' : 'INACTIVE';
@@ -239,6 +238,7 @@ class Roles extends BaseRoles {
$obj = new Roles();
$obj->fromArray($aData, BasePeer::TYPE_FIELDNAME);
if ($obj->validate()) {
$con->begin();
$result = $obj->save();
$con->commit();
$obj->setRolName($rol_name);