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

Merged master into dashboards2

Browse Source
This commit is contained in:
Dante Loayza
2015-03-31 14:29:38 -04:00
parent c0867cfc35 ec1a31e6a6
commit 751c96f82f
7 changed files with 59 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2246,7 +2246,18 @@ var processmap=function(){
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(
{
@@ -2281,10 +2292,13 @@ var processmap=function(){
iWidth = 450;
iHeight = 205;
break;
case 8:
case 8:
iWidth = 550;
iHeight = 300;
break;
default:
iWidth = 400;
iHeight = 110;
}
this.tmp.derivationsPanel = panel =new leimnud.module.panel();