fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of git://github.com/colosa/processmaker into BUG-11421

Browse Source
This commit is contained in:
Luis Fernando Saisa Lopez
2013-05-03 12:49:16 +00:00
parent 0bd6be7bd8 9aa061e4df
commit 0682855b70
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/classes/class.pmScript.php
View File

@@ -341,7 +341,11 @@ class PMScript
if (!isset($this->aFields[$aMatch[2][$i][0]])) {
eval("\$this->aFields['" . $aMatch[2][$i][0] . "']" . $aMatch[5][$i][0] . " = '';");
} else {
eval("if (!isset(\$this->aFields['" . $aMatch[2][$i][0] . "']" . $aMatch[5][$i][0] . ")) {\$this->aFields['" . $aMatch[2][$i][0] . "']" . $aMatch[5][$i][0] . " = '';}");
if (isset($aMatch[5][$i][0])) {
eval("if (!isset(\$this->aFields['" . $aMatch[2][$i][0] . "']" . $aMatch[5][$i][0] . ")) {\$this->aFields['" . $aMatch[2][$i][0] . "']" . $aMatch[5][$i][0] . " = '';}");
} else {
eval("if (!isset(\$this->aFields['" . $aMatch[2][$i][0] . "'])) {\$this->aFields['" . $aMatch[2][$i][0] . "'] = '';}");
}
}
}
$sAux = substr( $this->sScript, $iAux, $aMatch[0][$i][1] - $iAux );

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

@@ -2137,6 +2137,8 @@ class processMap
try {
$oProcess = new Process();
$aFields = $oProcess->load($sProcessUID);
$partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
$aFields['PARTNER_FLAG'] = $partnerFlag;
global $G_PUBLISH;
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent('propeltable', 'paged-table', 'triggers/triggers_ShortList', $this->getTriggersCriteria($sProcessUID), $aFields);

17
workflow/engine/skinEngine/skinEngine.php
View File

@@ -11,6 +11,7 @@ define('SE_LAYOUT_NOT_FOUND', 6);
class SkinEngine
{
private $skinDefault = '';
private $layout = '';
private $template = '';
@@ -41,16 +42,16 @@ class SkinEngine
$this->content = $content;
$this->skinVariants = array('blank','extjs','raw','tracker','submenu');
$this->skinsBasePath = G::ExpandPath("skinEngine");
$sysConf = System::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
$this->skinDefault = (isset($sysConf['default_skin']) && $sysConf['default_skin'] != '') ? $sysConf['default_skin'] : 'classic';
$this->_init();
}
private function _init()
{
// setting default skin
if (!isset($this->skin) || $this->skin == "") {
$this->skin = "classic";
$this->skin = $this->skinDefault;
}
// deprecated submenu type ""green-submenu"" now is mapped to "submenu"
@@ -73,7 +74,7 @@ class SkinEngine
// setting default skin
if (!isset($_SESSION['currentSkin'])) {
$_SESSION['currentSkin'] = "classic";
$_SESSION['currentSkin'] = $this->skinDefault;
}
$this->mainSkin = $_SESSION['currentSkin'];
@@ -100,7 +101,13 @@ class SkinEngine
$skinObject = $this->skinsBasePath . $this->mainSkin;
}
else { //Skin doesn't exist
$this->mainSkin = "classic";
$this->mainSkin = $this->skinDefault;
if (defined('PATH_CUSTOM_SKINS') && is_dir(PATH_CUSTOM_SKINS . $this->mainSkin)) { // check this skin on user skins path
$skinObject = PATH_CUSTOM_SKINS . $this->mainSkin;
}
else if (is_dir($this->skinsBasePath . $this->mainSkin)) { // check this skin on core skins path
$skinObject = $this->skinsBasePath . $this->mainSkin;
}
}
}

3
workflow/engine/xmlform/triggers/triggers_Options.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<dynaForm type="xmlmenu">
<MNU_ADD type="link" value='' link="#" onclick="triggerFromLibrary(); return false;" colAlign="left" colWidth="100">
<MNU_ADD type="link" value='' link="#" onclick="if('@%PARTNER_FLAG' == '' || '@%PARTNER_FLAG' == 0) { triggerFromLibrary(); } else { triggerNewCustom(); } return false;" colAlign="left" colWidth="100">
<en>New</en>
</MNU_ADD>
@@ -9,6 +9,7 @@
<PRO_UID type="private"/>
<PARTNER_FLAG type="private"/>
<FIELDS_REQUIRED type="private"/>
<triggersEdit type="private" defaultValue="../triggers/triggers_Edit"/>