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

Merge branch 'master' of bitbucket.org:colosa/processmaker

Browse Source
This commit is contained in:
Freddy Daniel Rojas Valda
2013-12-12 09:09:47 -04:00
parent f19aa26b4c 5d066964b2
commit 502fa773a2
22 changed files with 1519 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/class.configuration.php
View File

@@ -535,13 +535,13 @@ class Configurations // extends Configuration
return $formats;
}
public function getSystemDate($dateTime)
public function getSystemDate($dateTime, $type='dateFormat')
{
$oConf = new Configurations();
$oConf->getFormats();
$dateFormat = $oConf->UserConfig['dateFormat'];
$oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
$creationDateMask = isset($oConf->aConfig['dateFormat']) ? $oConf->aConfig['dateFormat'] : '';
$creationDateMask = isset($oConf->aConfig[$type]) ? $oConf->aConfig[$type] : '';
$creationDateMask = ($creationDateMask == '') ? $dateFormat : $creationDateMask;
if ($creationDateMask != '') {
if (strpos($dateTime, ' ') !== false) {

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

@@ -254,7 +254,9 @@ class AppNotes extends BaseAppNotes
$noteRecipientsList = array();
foreach ($p["array"] as $key => $userParticipated) {
$noteRecipientsList[] = $key;
if ($key != '') {
$noteRecipientsList[] = $key;
}
}
$noteRecipients = implode(",", $noteRecipientsList);

2
workflow/engine/classes/model/OutputDocument.php
View File

@@ -477,7 +477,7 @@ class OutputDocument extends BaseOutputDocument
public function generate($sUID, $aFields, $sPath, $sFilename, $sContent, $sLandscape = false, $sTypeDocToGener = 'BOTH', $aProperties = array())
{
if (($sUID != '') && is_array($aFields) && ($sPath != '')) {
$sContent = G::replaceDataGridField($sContent, $aFields);
$sContent = nl2br(G::replaceDataGridField($sContent, $aFields));
G::verifyPath($sPath, true);

13
workflow/engine/controllers/home.php
View File

@@ -332,7 +332,18 @@ class Home extends Controller
}
if (isset( $row['DEL_DELEGATE_DATE'] )) {
$cases['data'][$i]['DEL_DELEGATE_DATE'] = G::getformatedDate( $row['DEL_DELEGATE_DATE'], 'M d, yyyy - h:i:s' );
G::LoadClass( "configuration" );
$conf = new Configurations();
$generalConfCasesList = $conf->getConfiguration( 'ENVIRONMENT_SETTINGS', '' );
$cases['data'][$i]['DEL_DELEGATE_DATE'] = '';
if (defined('SYS_SYS')) {
if (isset( $generalConfCasesList['casesListDateFormat'] ) && ! empty( $generalConfCasesList['casesListDateFormat'] )) {
$cases['data'][$i]['DEL_DELEGATE_DATE'] = $conf->getSystemDate($row['DEL_DELEGATE_DATE'], 'casesListDateFormat');
}
}
if ($cases['data'][$i]['DEL_DELEGATE_DATE'] == '') {
$cases['data'][$i]['DEL_DELEGATE_DATE'] = $conf->getSystemDate($row['DEL_DELEGATE_DATE']);
}
}
if (isset( $row['APP_DEL_PREVIOUS_USER'] )) {
$cases['data'][$i]['APP_DEL_PREVIOUS_USER'] = ucwords( $row['APP_DEL_PREVIOUS_USER'] );

1
workflow/engine/methods/cases/proxySaveReassignCasesList.php
View File

@@ -54,6 +54,7 @@ if (is_array( $aData )) {
$currentCasesReassigned = 0;
foreach ($aData as $data) {
$oTmpReassignCriteria = $oCasesReassignList;
$oTmpReassignCriteria->add( AppCacheViewPeer::APP_UID, $data->APP_UID );
$oTmpReassignCriteria->add( AppCacheViewPeer::TAS_UID, $data->TAS_UID );
$rs = AppCacheViewPeer::doSelectRS( $oTmpReassignCriteria );
$rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );

3
workflow/engine/methods/login/authentication.php
View File

@@ -81,6 +81,9 @@ try {
case -5:
$errLabel = 'ID_AUTHENTICATION_SOURCE_INVALID';
break;
case -6:
$errLabel = 'ID_ROLE_INACTIVE';
break;
}
//to avoid empty string in user field. This will avoid a weird message "this row doesn't exist"

2
workflow/engine/methods/users/usersAjax.php
View File

@@ -160,7 +160,7 @@ switch ($_POST['action']) {
$aData['USR_AUTH_USER_DN'] = $form['USR_AUTH_USER_DN'];
//fixing bug in inactive user when the admin create a new user.
$statusWF = $form['USR_STATUS'];
$aData['USR_STATUS'] = $form['USR_STATUS'] == 'ACTIVE' ? 1 : 0;
$aData['USR_STATUS'] = $form['USR_STATUS'] ;//== 'ACTIVE' ? 1 : 0;
try {
$sUserUID = $RBAC->createUser($aData, $form['USR_ROLE']);
} catch(Exception $oError) {

2
workflow/engine/templates/cases/casesList.js
View File

@@ -1975,7 +1975,7 @@ var gridForm = new Ext.FormPanel({
}*/
}),
//autoExpandColumn: 'company',
height: 350,
height: 265,
title : _('ID_CASES_TO_REASSIGN_TASK_LIST'),
border : true,

1
workflow/engine/templates/pmTables/edit.js
View File

@@ -681,6 +681,7 @@ Ext.onReady(function(){
xtype: "checkbox",
id: "chkKeepData",
name: "chkKeepData",
checked : true,
boxLabel: _("ID_PMTABLE_DATA_KEEP")
}
]

10
workflow/engine/xmlform/triggers/triggers_Edit.xml
View File

@@ -89,10 +89,12 @@ function cancel(){
function triggerSave1(form){
ajax_post(form.action, form, 'POST');
if(@QSTEP_UID!="" && @QST_TYPE!="" && opener.showTriggers)
opener.showTriggers(@QSTEP_UID,@QST_TYPE);
if(opener.reloadTriggersShortList)
opener.reloadTriggersShortList();
if(opener) {
if(@QSTEP_UID!="" && @QST_TYPE!="" && opener.showTriggers)
opener.showTriggers(@QSTEP_UID,@QST_TYPE);
if(opener.reloadTriggersShortList)
opener.reloadTriggersShortList();
}
window.close();
}