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

Merge branch '2.0' of git.colosa.net:processmaker into 2.0

Browse Source
This commit is contained in:
Alvaro Campos
2011-03-29 16:18:27 -04:00
parent 611fd3b3a2 8a8a83bed1
commit d0d8b9bde9
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3247,6 +3247,10 @@ class processMap {
$sObject = G::LoadTranslation('ID_ALL'); $sObject = G::LoadTranslation('ID_ALL');
} }
break; break;
default :
$sObjectType = G::LoadTranslation('ID_ALL');
$sObject = G::LoadTranslation('ID_ALL');
break;
} }
//Participated //Participated
if ($aRow ['OP_PARTICIPATE'] == 0) { if ($aRow ['OP_PARTICIPATE'] == 0) {

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

@@ -2337,9 +2337,14 @@ processmap.prototype={
/* Panel editor */ /* Panel editor */
this.panels.editor=new leimnud.module.panel(); this.panels.editor=new leimnud.module.panel();
oClientWinSize = getClientWindowSize();
var heightPanel = this.options.size.h;
if(heightPanel <= oClientWinSize.height ) heightPanel = heightPanel + 800;
this.panels.editor.options={ this.panels.editor.options={
limit:true, limit:true,
size:{w:this.options.size.w,h:this.options.size.h}, // size:{w:this.options.size.w,h:this.options.size.h},
size:{w:this.options.size.w,h:heightPanel},
position:{x:200,y:0,centerX:true}, position:{x:200,y:0,centerX:true},
title:"", title:"",
titleBar:false, titleBar:false,