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:
Carlos Pacha
2011-03-25 11:58:42 -04:00
parent d52aa80f90 101db6f170
commit 123a7ebfcb
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/methods/cases/cases_StepToReviseInputs.php
View File

@@ -61,6 +61,7 @@ $G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE';
$oTemplatePower->prepare(); $oTemplatePower->prepare();
$G_PUBLISH = new Publisher; $G_PUBLISH = new Publisher;
$oHeadPublisher =& headPublisher::getSingleton(); $oHeadPublisher =& headPublisher::getSingleton();
// Check if these code needs to be removed since the interface ar now moving to ExtJS
$oHeadPublisher->addScriptCode(' $oHeadPublisher->addScriptCode('
var Cse = {}; var Cse = {};
Cse.panels = {}; Cse.panels = {};
@@ -76,6 +77,7 @@ $oHeadPublisher->addScriptCode('
'.(isset($_SESSION['showCasesWindow'])?'try{'.$_SESSION['showCasesWindow'].'}catch(e){}':'').' '.(isset($_SESSION['showCasesWindow'])?'try{'.$_SESSION['showCasesWindow'].'}catch(e){}':'').'
}); });
'); ');
// Check if these code needs to be removed since the interface ar now moving to ExtJS
$G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower); $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
if(!isset($_GET['position'])) $_GET['position'] = 1; if(!isset($_GET['position'])) $_GET['position'] = 1;
@@ -144,6 +146,7 @@ G::RenderPage('publish', 'blank');
<script> <script>
/*------------------------------ To Revise Routines ---------------------------*/ /*------------------------------ To Revise Routines ---------------------------*/
//Deprecated Section since the interface are now movig to ExtJS
function setSelect() function setSelect()
{ {
var ex=<?=$_GET['ex']?>; var ex=<?=$_GET['ex']?>;
@@ -194,6 +197,8 @@ function toRevisePanel(APP_UID,DEL_INDEX)
}.extend(this); }.extend(this);
oRPC.make(); oRPC.make();
} }
//Deprecated Section since the interface are now movig to ExtJS
//Remove this Jscript code
//toRevisePanel('<?=$_GET['APP_UID']?>','<?=$_GET['DEL_INDEX']?>');
toRevisePanel('<?=$_GET['APP_UID']?>','<?=$_GET['DEL_INDEX']?>');
</script> </script>

5
workflow/engine/methods/cases/cases_StepToReviseOutputs.php
View File

@@ -52,6 +52,7 @@ $oTemplatePower = new TemplatePower(PATH_TPL . 'cases/cases_Step.html');
$oTemplatePower->prepare(); $oTemplatePower->prepare();
$G_PUBLISH = new Publisher; $G_PUBLISH = new Publisher;
$oHeadPublisher =& headPublisher::getSingleton(); $oHeadPublisher =& headPublisher::getSingleton();
// check if the code for the addScriptCode is necessary since the interface is now based in ExtJs
$oHeadPublisher->addScriptCode(' $oHeadPublisher->addScriptCode('
var Cse = {}; var Cse = {};
Cse.panels = {}; Cse.panels = {};
@@ -76,6 +77,7 @@ if(!isset($_GET['ex'])) $_GET['ex']=0;
?> ?>
<script type="text/javascript"> <script type="text/javascript">
/*------------------------------ To Revise Routines ---------------------------*/ /*------------------------------ To Revise Routines ---------------------------*/
//Deprecated Section since the interface are now movig to ExtJS
function setSelect() function setSelect()
{ {
var ex=<?=$_GET['ex']?>; var ex=<?=$_GET['ex']?>;
@@ -94,6 +96,7 @@ function setSelect()
return 0; return 0;
} }
} }
//Deprecated Section since the interface are now movig to ExtJS
function toRevisePanel(APP_UID,DEL_INDEX) function toRevisePanel(APP_UID,DEL_INDEX)
{ {
oPanel = new leimnud.module.panel(); oPanel = new leimnud.module.panel();
@@ -126,5 +129,5 @@ function toRevisePanel(APP_UID,DEL_INDEX)
oRPC.make(); oRPC.make();
} }
toRevisePanel('<?=$_GET['APP_UID']?>','<?=$_GET['DEL_INDEX']?>'); //toRevisePanel('<?=$_GET['APP_UID']?>','<?=$_GET['DEL_INDEX']?>');
</script> </script>