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

Merge remote-tracking branch 'pm/3.1.2' into HOR-2045

Browse Source
This commit is contained in:
Ronald Q
2016-10-13 16:10:55 -04:00
parent da3d8e4631 58600c6d4f
commit bec4ff8396
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
workflow/engine/bin/cron_single.php
View File

@@ -207,6 +207,13 @@ try {
eprintln('WARNING! No server info found!', 'red');
}
$sSerializedFile = PATH_DATA_SITE . 'plugin.singleton';
if (file_exists($sSerializedFile)) {
$pluginRegistry = PMPluginRegistry::loadSingleton($sSerializedFile);
}
G::LoadClass('pmScript');
//DB
$phpCode = '';
@@ -334,10 +341,6 @@ try {
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) . "\n" );
}
//Functions
function processWorkspace()
{

3
workflow/engine/classes/class.ldapAdvanced.php
View File

@@ -2817,7 +2817,7 @@ class ldapAdvanced
switch ($fieldName) {
case 'USR_STATUS':
if ($attributeName == 'useraccountcontrol') {
$ldapAttributeValue = (in_array($ldapAttributeValue, array('512', '544', '66048', '66080')))? 'ACTIVE' : 'INACTIVE';
$ldapAttributeValue = (preg_match('/^(?:' . '512|544|66048|66080' . ')$/', $ldapAttributeValue))? (($arrayUser[$username][$fieldName] == 'VACATION')? 'VACATION' : 'ACTIVE') : 'INACTIVE';
}
break;
case 'USR_DUE_DATE':
@@ -3053,4 +3053,3 @@ class ldapAdvanced
}
}
}

4
workflow/engine/classes/model/ListParticipatedLast.php
View File

@@ -298,7 +298,7 @@ class ListParticipatedLast extends BaseListParticipatedLast
$criteria->addSelectColumn(ListParticipatedLastPeer::TAS_UID);
$criteria->addSelectColumn(ListParticipatedLastPeer::PRO_UID);
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_NUMBER);
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_TITLE);
$criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_PRO_TITLE);
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_TAS_TITLE);
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_STATUS);
@@ -341,6 +341,8 @@ class ListParticipatedLast extends BaseListParticipatedLast
$criteria->setOffset( $start );
}
$criteria->addJoin(ListParticipatedLastPeer::APP_UID,ApplicationPeer::APP_UID,Criteria::LEFT_JOIN);
$dataset = ListParticipatedLastPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro') );
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$data = array();