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

Merged in mcuiza/processmaker/PM-1859 (pull request #1788)

Browse Source 
PM-1859 - Error al ingresar a las reglas de ruteo de un subproceso
This commit is contained in:
Julio Cesar Laura Avendaño
2015-03-31 13:50:47 -04:00
parent 8b41041c02 91b2bb4c4e
commit 219619e6e0
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/classes/class.processMap.php
View File

@@ -2640,7 +2640,7 @@ class processMap
} }
} else { } else {
throw new Exception(G::loadTranslation('ID_INVALID_ROU_TYPE_DEFINITION_ON_ROUTE_TABLE')); throw new Exception(G::loadTranslation('ID_NO_DERIVATIONS_DEFINED'));
} }
$aFields['action'] = 'savePattern'; $aFields['action'] = 'savePattern';
@@ -2658,7 +2658,8 @@ class processMap
$aMessage = array(); $aMessage = array();
$aMessage['MESSAGE'] = $oError->getMessage(); $aMessage['MESSAGE'] = $oError->getMessage();
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage); $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage);
G::RenderPage('publish', 'blank'); G::RenderPage('publish', 'raw');
return true;
die(); die();
} }
} }

18
workflow/engine/js/processmap/core/processmap.js
View File

@@ -2246,7 +2246,18 @@ var processmap=function(){
if (event) if (event)
{ {
if (typeof(this.data.db.task[index].derivation.type) == 'undefined') if(typeof(this.data.db.task[index].derivation.type.length) == 'undefined')
{
var derivationFlag = '1';
}
else
{
if(this.data.db.task[index].derivation.type.length == '0')
{
var derivationFlag = '0';
}
}
if (typeof(this.data.db.task[index].derivation.type) == 'undefined' || derivationFlag == '0')
{ {
new leimnud.module.app.alert().make( new leimnud.module.app.alert().make(
{ {
@@ -2281,10 +2292,13 @@ var processmap=function(){
iWidth = 450; iWidth = 450;
iHeight = 205; iHeight = 205;
break; break;
case 8: case 8:
iWidth = 550; iWidth = 550;
iHeight = 300; iHeight = 300;
break; break;
default:
iWidth = 400;
iHeight = 110;
} }
this.tmp.derivationsPanel = panel =new leimnud.module.panel(); this.tmp.derivationsPanel = panel =new leimnud.module.panel();