Merge remote-tracking branch 'upstream/master'

2013-05-06 10:17:14 -04:00
parent 1cbcbd7922 9bdaf7b2e9
commit 2bae6d540b
14 changed files with 69 additions and 42 deletions
--- a/workflow/engine/classes/class.dashletProcessMakerCommunity.php
+++ b/workflow/engine/classes/class.dashletProcessMakerCommunity.php
@@ -115,14 +115,6 @@ class dashletProcessMakerCommunity implements DashletInterface
      </div>
      <div class=\"clearf\"></div>

-      <div class=\"icon\"><img src=\"/images/dashlets/community_library.png\" style=\"border: medium none;\"></div>
-      <div class=\"description\">
-        <strong>LIBRARY - </strong><a href=\"http://library.processmaker.com/\" target=\"_blank\" title=\"http://library.processmaker.com\">http://library.processmaker.com</a>
-        <br />
-        Download Process Map templates from the Library for use in ProcessMaker. &nbsp;We're adding new processes all the time, so look out for new templates!
-      </div>
-      <div class=\"clearf\"></div>
-
      <div class=\"icon\"><img src=\"/images/dashlets/community_blog.png\" style=\"border: medium none;\"></div>
      <div class=\"description\">
        <strong>BLOG - </strong><a href=\"http://blog.processmaker.com/\" target=\"_blank\" title=\"http://blog.processmaker.com\">http://processmakerblog.com</a>
--- a/workflow/engine/classes/class.pmDashlet.php
+++ b/workflow/engine/classes/class.pmDashlet.php
@@ -272,7 +272,7 @@ class PMDashlet extends DashletInstance implements DashletInterface
                    if (! isset( $dashletsInstances[$row['DAS_INS_UID']] )) {
                        $arrayField = unserialize( $row["DAS_INS_ADDITIONAL_PROPERTIES"] );

-                        if (!(self::verifyPluginDashlet($row['DAS_CLASS']))) {
+                        if (self::verifyPluginDashlet($row["DAS_CLASS"])) {
                            $row['DAS_XTEMPLATE'] = $this->getXTemplate( $row['DAS_CLASS'] );
                            $row["DAS_TITLE"] = (isset( $arrayField["DAS_INS_TITLE"] ) && ! empty( $arrayField["DAS_INS_TITLE"] )) ? $arrayField["DAS_INS_TITLE"] : $row["DAS_TITLE"];
                            $row["DAS_TITLE"] = $row["DAS_TITLE"] . ((isset( $arrayField["DAS_INS_SUBTITLE"] ) && ! empty( $arrayField["DAS_INS_SUBTITLE"] )) ? str_replace( "@@USR_USERNAME", $_SESSION["USR_USERNAME"], $arrayField["DAS_INS_SUBTITLE"] ) : null);
@@ -303,7 +303,7 @@ class PMDashlet extends DashletInstance implements DashletInterface
                    if (! isset( $dashletsInstances[$row['DAS_INS_UID']] )) {
                        $arrayField = unserialize( $row["DAS_INS_ADDITIONAL_PROPERTIES"] );

-                        if (!(self::verifyPluginDashlet($row['DAS_CLASS']))) {
+                        if (self::verifyPluginDashlet($row["DAS_CLASS"])) {
                            $row['DAS_XTEMPLATE'] = $this->getXTemplate( $row['DAS_CLASS'] );
                            $row["DAS_TITLE"] = (isset( $arrayField["DAS_INS_TITLE"] ) && ! empty( $arrayField["DAS_INS_TITLE"] )) ? $arrayField["DAS_INS_TITLE"] : $row["DAS_TITLE"];
                            $row["DAS_TITLE"] = $row["DAS_TITLE"] . ((isset( $arrayField["DAS_INS_SUBTITLE"] ) && ! empty( $arrayField["DAS_INS_SUBTITLE"] )) ? str_replace( "@@USR_USERNAME", $_SESSION["USR_USERNAME"], $arrayField["DAS_INS_SUBTITLE"] ) : null);
--- a/workflow/engine/classes/class.pmScript.php
+++ b/workflow/engine/classes/class.pmScript.php
@@ -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 );
--- 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);
--- a/workflow/engine/classes/class.system.php
+++ b/workflow/engine/classes/class.system.php
@@ -956,6 +956,11 @@ class System
                $folderId = 'classic';
            }

+            $partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
+            if ($partnerFlag && ($folderId == 'classic')){
+                continue;
+            }
+
            $xmlConfiguration = file_get_contents( $configInformation );
            $xmlConfigurationObj = G::xmlParser( $xmlConfiguration );

--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -1197,6 +1197,12 @@ class workspaceTools
            foreach ($metadata->directories as $dir) {
                CLI::logging("+> Restoring directory '$dir'\n");

+                if(file_exists("$tempDirectory/$dir" . "/ee")) {
+                    G::rm_dir("$tempDirectory/$dir" . "/ee");
+                }
+                if(file_exists("$tempDirectory/$dir" . "/plugin.singleton")) {
+                    G::rm_dir("$tempDirectory/$dir" . "/plugin.singleton");
+                }
                if (!rename("$tempDirectory/$dir", $workspace->path)) {
                    throw new Exception("There was an error copying the backup files ($tempDirectory/$dir) to the workspace directory {$workspace->path}.");
                }
--- a/workflow/engine/js/dynaforms/dynaforms_conditionalShowHide.js
+++ b/workflow/engine/js/dynaforms/dynaforms_conditionalShowHide.js
@@ -555,6 +555,10 @@ var Conditional = function(DYN_UID){
    }

    this.saveCondition = function(){
+    	if (!sessionPersits()) {
+    	    showPrompt('conditionalShowHide');
+    	    return;
+    	}
        var oTmp;
        this.canSave = true;
        oUID = getField('FCD_UID');
--- a/workflow/engine/menus/setup.php
+++ b/workflow/engine/menus/setup.php
@@ -75,7 +75,7 @@ if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1 ) {
 }

 //users options
-if ($RBAC->userCanAccess('PM_SETUP') == 1 || $RBAC->userCanAccess('PM_USERS') == 1) {
+if ($RBAC->userCanAccess('PM_USERS') == 1) {
  $G_TMP_MENU->AddIdRawOption('USERS', '../users/users_List', G::LoadTranslation('ID_USERS_LIST'), 'icon-webservices.png', '', 'users');

  $G_TMP_MENU->AddIdRawOption('GROUPS', '../groups/groups', G::LoadTranslation('ID_GROUPS'), '', '', 'users');
@@ -83,7 +83,7 @@ if ($RBAC->userCanAccess('PM_SETUP') == 1 || $RBAC->userCanAccess('PM_USERS') ==
  $G_TMP_MENU->AddIdRawOption('ROLES', '../roles/roles_List', G::LoadTranslation('ID_ROLES'), '', '', 'users');
 }

-if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1) {
+if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1 && $RBAC->userCanAccess('PM_USERS') == 1) {
  $G_TMP_MENU->AddIdRawOption('AUTHSOURCES', '../authSources/authSources_List', G::LoadTranslation('ID_AUTH_SOURCES'), '', '', 'users');
  $G_TMP_MENU->AddIdRawOption('UX', '../admin/uxList', G::LoadTranslation('ID_USER_EXPERIENCE'), '', '', 'users');
  $G_TMP_MENU->AddIdRawOption('SYSTEM', '../admin/system', G::LoadTranslation('ID_SYSTEM'), '', '', 'settings');
--- 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;
+	      }
      }
    }

--- a/workflow/engine/templates/departments/departmentUsers.js
+++ b/workflow/engine/templates/departments/departmentUsers.js
@@ -341,10 +341,13 @@ DDLoadUsers = function(){
    var records =  ddSource.dragData.selections;
    var arrAux = new Array();
    for (var r=0; r < records.length; r++){
-      arrAux[r] = records[r].data['USR_UID'];
+      if (records[r].data['USR_SUPERVISOR']==false) {
+        arrAux[r] = records[r].data['USR_UID'];
+      }else{
+        PMExt.notify(_('ID_DEPARTMENTS'),_('ID_DELETE_SUPERVISOR'));
+      };
    }
    DeleteDepartmentUser(arrAux,RefreshUsers,FailureProcess);
-    return true;
  }
 });

@@ -427,7 +430,11 @@ RemoveGroupsAction = function(){
  rowsSelected = assignedGrid.getSelectionModel().getSelections();
  var arrAux = new Array();
  for(var a=0; a < rowsSelected.length; a++){
-    arrAux[a] = rowsSelected[a].get('USR_UID');
+    if (rowsSelected[a].get('USR_SUPERVISOR')==false) {
+      arrAux[a] = rowsSelected[a].get('USR_UID');
+    }else{
+      PMExt.notify(_('ID_DEPARTMENTS'),_('ID_DELETE_SUPERVISOR'));
+    };
  }
  DeleteDepartmentUser(arrAux,RefreshUsers,FailureProcess);
 };
--- a/workflow/engine/templates/processes/main.js
+++ b/workflow/engine/templates/processes/main.js
@@ -263,16 +263,7 @@ Ext.onReady(function(){
          importProcessGlobal.processFileType = "pm";
          importProcess();
        }
-      },
-	  !PARTNER_FLAG ?
-	  [{
-		  text: _('ID_BROWSE_LIBRARY'),
-		  iconCls: 'button_menu_ext ss_sprite  ss_world',
-		  //icon: '/images/icon-pmwebservices.png',
-		  handler: browseLibrary
-		}
-	  ] : [],
-      {
+      },{
        xtype: 'tbfill'
      },{
        xtype: 'tbseparator'
@@ -1095,10 +1086,6 @@ importProcess = function()
  w.show();
 }

-browseLibrary = function(){
-  window.location = 'processes_Library';
-}
-
 function activeDeactive(){
  var rows = processesGrid.getSelectionModel().getSelections();

--- 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"/>