fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker into master-d

Browse Source
This commit is contained in:
Freddy Daniel Rojas Valda
2014-11-05 08:48:26 -04:00
parent 468fdf5612 b95b9e76da
commit e8f55ed01a
2 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
workflow/engine/methods/setup/clearCompiledAjax.php
View File

@@ -3,23 +3,63 @@ try {
$response = new stdClass;
if (isset( $_POST['javascriptCache'] ) || isset( $_POST['metadataCache'] ) || isset( $_POST['htmlCache'] )) {
$msgLog = '';
if (isset( $_POST['javascriptCache'] )) {
G::rm_dir( PATH_C . 'ExtJs' );
$msgLog = "";
$msgLogAux = "";
if (isset($_POST["javascriptCache"])) {
G::rm_dir(PATH_C . "ExtJs");
$response->javascript = true;
$msgLog .= 'Javascript cache ';
}
if (isset( $_POST['metadataCache'] )) {
G::rm_dir( PATH_C . 'xmlform' );
$response->xmlform = true;
$msgLog .= 'Forms Metadata cache ';
}
$msgLog = $msgLog . "Javascript Cache";
if (isset( $_POST['htmlCache'] )) {
G::rm_dir( PATH_C . 'smarty' );
$response->smarty = true;
$msgLog .= 'Forms Html Templates cache ';
if (isset($_POST["metadataCache"])) {
G::rm_dir(PATH_C . "xmlform");
$response->xmlform = true;
$msgLogAux = $msgLog;
$msgLog = $msgLog . ", Forms Metadata Cache";
if (isset($_POST["htmlCache"])) {
G::rm_dir(PATH_C . "smarty");
$response->smarty = true;
$msgLog = $msgLog . " and Forms Html Templates Cache.";
} else {
$msgLog = $msgLogAux ." and Forms Metadata Cache.";
}
} else {
if (isset($_POST["htmlCache"])) {
G::rm_dir(PATH_C . "smarty");
$response->smarty = true;
$msgLog = $msgLog . " and Forms Html Templates Cache.";
} else {
$msgLog = $msgLog . ".";
}
}
} else {
if (isset($_POST["metadataCache"])) {
G::rm_dir(PATH_C . "xmlform");
$response->xmlform = true;
$msgLog = $msgLog . "Forms Metadata Cache";
if (isset($_POST["htmlCache"])) {
G::rm_dir(PATH_C . "smarty");
$response->smarty = true;
$msgLog = $msgLog . " and Forms Html Templates Cache.";
} else {
$msgLog = $msgLog . ".";
}
} else {
if (isset($_POST["htmlCache"])) {
G::rm_dir(PATH_C . "smarty");
$response->smarty = true;
$msgLog = $msgLog . "Forms Html Templates Cache.";
}
}
}
$response->success = true;

1
workflow/engine/methods/triggers/triggers_Edit.php
View File

@@ -46,6 +46,7 @@ if (isset( $_GET['TRI_UID'] )) {
$ST_TYPE = isset($_GET['ST_TYPE'])?$_GET['ST_TYPE']:'';
$_GET = $aTriggerData['params'];
$_GET['TRI_UID'] = $triUid;
$_GET['PRO_UID'] = $aFields['PRO_UID'];
$_GET['STEP_UID']=$STEP_UID;
$_GET['ST_TYPE']=$ST_TYPE;
require_once ('triggers_EditWizard.php');