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

Merge pull request #1676 from brayanpereyra/master

Browse Source 
DOCSYSTEM Arreglos para crear nuevo trigger y cargar skin por defecto
This commit is contained in:
Erik Amaru Ortiz
2013-05-02 13:28:31 -07:00
parent ebc2c09768 ba159c5d96
commit 9aa061e4df
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2137,6 +2137,8 @@ class processMap
try { try {
$oProcess = new Process(); $oProcess = new Process();
$aFields = $oProcess->load($sProcessUID); $aFields = $oProcess->load($sProcessUID);
$partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
$aFields['PARTNER_FLAG'] = $partnerFlag;
global $G_PUBLISH; global $G_PUBLISH;
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent('propeltable', 'paged-table', 'triggers/triggers_ShortList', $this->getTriggersCriteria($sProcessUID), $aFields); $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 class SkinEngine
{ {
private $skinDefault = '';
private $layout = ''; private $layout = '';
private $template = ''; private $template = '';
@@ -41,16 +42,16 @@ class SkinEngine
$this->content = $content; $this->content = $content;
$this->skinVariants = array('blank','extjs','raw','tracker','submenu'); $this->skinVariants = array('blank','extjs','raw','tracker','submenu');
$this->skinsBasePath = G::ExpandPath("skinEngine"); $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(); $this->_init();
} }
private function _init() private function _init()
{ {
// setting default skin // setting default skin
if (!isset($this->skin) || $this->skin == "") { if (!isset($this->skin) || $this->skin == "") {
$this->skin = "classic"; $this->skin = $this->skinDefault;
} }
// deprecated submenu type ""green-submenu"" now is mapped to "submenu" // deprecated submenu type ""green-submenu"" now is mapped to "submenu"
@@ -73,7 +74,7 @@ class SkinEngine
// setting default skin // setting default skin
if (!isset($_SESSION['currentSkin'])) { if (!isset($_SESSION['currentSkin'])) {
$_SESSION['currentSkin'] = "classic"; $_SESSION['currentSkin'] = $this->skinDefault;
} }
$this->mainSkin = $_SESSION['currentSkin']; $this->mainSkin = $_SESSION['currentSkin'];
@@ -100,7 +101,13 @@ class SkinEngine
$skinObject = $this->skinsBasePath . $this->mainSkin; $skinObject = $this->skinsBasePath . $this->mainSkin;
} }
else { //Skin doesn't exist 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"?> <?xml version="1.0" encoding="UTF-8"?>
<dynaForm type="xmlmenu"> <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> <en>New</en>
</MNU_ADD> </MNU_ADD>
@@ -9,6 +9,7 @@
<PRO_UID type="private"/> <PRO_UID type="private"/>
<PARTNER_FLAG type="private"/>
<FIELDS_REQUIRED type="private"/> <FIELDS_REQUIRED type="private"/>
<triggersEdit type="private" defaultValue="../triggers/triggers_Edit"/> <triggersEdit type="private" defaultValue="../triggers/triggers_Edit"/>