fernando/luos
1
0
Fork 0
Code Releases Activity

Merged colosa/processmaker into master

Browse Source
This commit is contained in:
Marco Antonio Nina Mena
2015-06-01 08:41:50 -04:00
parent 27471a1d5f 40f5026211
commit 5dd419e2dc
5 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1357,6 +1357,10 @@ class workspaceTools
}
if ( !$flag && !is_null($flagFunction) ) {
//Replace TYPE by ENGINE
$script = file_get_contents($filename);
$script = preg_replace('/\)TYPE\=|\)\sTYPE\=/', ')ENGINE=', $script);
file_put_contents($filename,$script);
$aHost = explode(':',$parameters['dbHost']);
$dbHost = $aHost[0];
if(isset($aHost[1])){

2
workflow/engine/js/controls/variablePicker.js
View File

@@ -4,6 +4,7 @@ var setVariablePickerJS = function(){
if(this.value.substring(0,5) == 'gridt') {
try {
updateEditorContent(this.value.substring(5));
closePluginPopup();
} catch(err) {
closePluginPopup();
}
@@ -21,6 +22,7 @@ var setVariablePickerJS = function(){
if(element.value.substring(0,5) == 'gridt') {
try {
updateEditorContent(element.value.substring(5));
closePluginPopup();
} catch(err) {
closePluginPopup();
}

13
workflow/engine/methods/cases/cases_OpenToRevise.php
View File

@@ -71,6 +71,13 @@ $_SESSION['STEP_POSITION'] = 0;
/* Redirect to next step */
$aNextStep = $oCase->getNextSupervisorStep( $_SESSION['PROCESS'], 0 );
$sPage = "cases_StepToRevise?type=DYNAFORM&PRO_UID=" . $aFields['PRO_UID'] . "&DYN_UID=" . $aNextStep['UID'] . "&APP_UID=$sAppUid&DEL_INDEX=$iDelIndex&position=1"; //$aNextStep['PAGE'];
G::header( 'location: ' . $sPage );
if($aNextStep['UID'] != ''){
$sPage = "cases_StepToRevise?type=DYNAFORM&PRO_UID=" . $aFields['PRO_UID'] . "&DYN_UID=" . $aNextStep['UID'] . "&APP_UID=$sAppUid&DEL_INDEX=$iDelIndex&position=1"; //$aNextStep['PAGE'];
G::header( 'location: ' . $sPage );
}else{
$aMessage = array ();
$aMessage['MESSAGE'] = G::LoadTranslation( 'ID_SUPERVISOR_DOES_NOT_HAVE_DYNAFORMS' );
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
G::RenderPage( 'publishBlank', 'blank' );
}

1
workflow/engine/skinEngine/neoclassic/css/form.css
View File

@@ -293,6 +293,7 @@ INPUT {
background-color: black;
left: 0px;
top: 0px;
height:100% !important;
}
.panel_iframe___processmaker {
width: 100%;

2
workflow/engine/templates/cases/open.js
View File

@@ -1539,7 +1539,7 @@ Ext.onReady(function(){
TabPanel.setActiveTab(tabId);
}
else {
if(name == "processMap" && isBrowserIE()){
if(name == "processMap" && isBrowserIE() && _PROJECT_TYPE === 'bpmn'){
var windContainer = window.open(uri,"winContainer");
} else {
TabPanel.add({