From ba159c5d96e77669c58049ab2c80690018fa3c91 Mon Sep 17 00:00:00 2001
From: Brayan Osmar Pereyra Suxo <brayan@colosa.com>
Date: Thu, 2 May 2013 16:16:09 -0400
Subject: [PATCH] DOCSYSTEM Arreglos para crear nuevo trigger y cargar skin por
 defecto

Arreglos para crear nuevo trigger y cargar skin por defecto
- Para el skin se tomara en cuenta el default_skin del env.ini
- Si esta seteada el PARTNER_FLAG No debe salir la lista de triggers
---
 workflow/engine/classes/class.processMap.php    |  2 ++
 workflow/engine/skinEngine/skinEngine.php       | 17 ++++++++++++-----
 .../xmlform/triggers/triggers_Options.xml       |  3 ++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index b7e9c7052..4cf28d1f8 100755
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -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);
diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php
index a487aa417..7e9857fdb 100755
--- a/workflow/engine/skinEngine/skinEngine.php
+++ b/workflow/engine/skinEngine/skinEngine.php
@@ -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;
+	      }
       }
     }
 
diff --git a/workflow/engine/xmlform/triggers/triggers_Options.xml b/workflow/engine/xmlform/triggers/triggers_Options.xml
index f77f0daf4..66e655a7f 100755
--- a/workflow/engine/xmlform/triggers/triggers_Options.xml
+++ b/workflow/engine/xmlform/triggers/triggers_Options.xml
@@ -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"/>