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

Merged in bugfix/HOR-2988 (pull request #5597)

Browse Source 
HOR-2988

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Ronald Henry Quenta Apaza
2017-04-07 21:15:07 +00:00
committed by Julio Cesar Laura Avendaño
parent 843fd18cc9 4fb11e2faf
commit de674e443f
5 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/classes/model/Application.php
View File

@@ -252,14 +252,11 @@ class Application extends BaseApplication
if ($this->validate()) {
$con->begin();
$res = $this->save();
$con->commit();
$this->setAppTitleContent('#' . $maxNumber);
$this->setAppDescriptionContent('');
//to do: ID_CASE in translation $this->setAppTitle(G::LoadTranslation('ID_CASE') . $maxNumber);
//Content::insertContent('APP_PROC_CODE', '', $this->getAppUid(), $lang, '');
$res = $this->save();
$con->commit();
return $this->getAppUid();

2
workflow/engine/classes/model/Dynaform.php
View File

@@ -209,9 +209,9 @@ class Dynaform extends BaseDynaform
$this->setDynVersion( $aData['DYN_VERSION'] );
if ($this->validate()) {
$con->begin();
$res = $this->save();
$this->setDynTitleContent( $dynTitle );
$this->setDynDescriptionContent( $dynDescription );
$res = $this->save();
$con->commit();
//Add Audit Log

4
workflow/engine/classes/model/Groupwf.php
View File

@@ -106,14 +106,12 @@ class Groupwf extends BaseGroupwf
if ($this->validate()) {
$con->begin();
$res = $this->save();
if (isset( $aData['GRP_TITLE'] )) {
$this->setGrpTitleContent( $aData['GRP_TITLE'] );
} else {
$this->setGrpTitleContent( 'Default Group Title' );
}
$res = $this->save();
$con->commit();
return $this->getGrpUid();
} else {

5
workflow/engine/classes/model/Process.php
View File

@@ -198,7 +198,6 @@ class Process extends BaseProcess
if ($this->validate()) {
$con->begin();
$res = $this->save();
if (isset( $aData['PRO_TITLE'] )) {
$this->setProTitleContent( $aData['PRO_TITLE'] );
@@ -212,6 +211,7 @@ class Process extends BaseProcess
$this->setProDescriptionContent( 'Default Process Description' );
}
$res = $this->save();
$con->commit();
$this->memcachedDelete();
@@ -445,7 +445,6 @@ class Process extends BaseProcess
$this->setProDynaforms( isset( $aData['PRO_DYNAFORMS'] ) ? (is_array( $aData['PRO_DYNAFORMS'] ) ? serialize( $aData['PRO_DYNAFORMS'] ) : $aData['PRO_DYNAFORMS']) : '' );
if ($this->validate()) {
$con->begin();
$res = $this->save();
if (isset( $aData['PRO_TITLE'] ) && trim( $aData['PRO_TITLE'] ) != '') {
$this->setProTitleContent( $aData['PRO_TITLE'] );
@@ -457,6 +456,8 @@ class Process extends BaseProcess
} else {
$this->setProDescriptionContent( 'Default Process Description' );
}
$res = $this->save();
$con->commit();
$this->memcachedDelete();

2
workflow/engine/classes/model/Triggers.php
View File

@@ -169,9 +169,9 @@ class Triggers extends BaseTriggers
} else {
$this->setTriParam( $aData['TRI_PARAM'] );
}
$result=$this->save();
$this->setTriTitleContent($triTitle);
$this->setTriDescriptionContent($triDescription);
$result = $this->save();
$con->commit();
//Add Audit Log
$description = "Trigger Name: ".$aData['TRI_TITLE'].", Trigger Uid: ".$triggerUid;