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

Merge branch 'master' of github.com:colosa/processmaker

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2013-10-25 10:00:13 -04:00
parent 0a2ed31b8b 29c9ea0476
commit 05fd1152c6
6 changed files with 65 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1162,8 +1162,12 @@ class workspaceTools
$chgrp = @chgrp($filename, $group);
$chmod = @chmod($filename, $perms);
if ($chgrp === false || $chmod === false || $chown === false) {
if (strtoupper( substr( PHP_OS, 0, 3 ) ) === 'WIN') {
exec( 'icacls ' . $dirNameWin . '/grant Administrador:(D,WDAC) /T', $res );
} else {
CLI::logging(CLI::error("Failed to set permissions for $filename") . "\n");
}
}
if (is_dir($filename)) {
foreach (array_merge(glob($filename . "/*"), glob($filename . "/.*")) as $item) {
if (basename($item) == "." || basename($item) == "..") {

12
workflow/engine/classes/model/AdditionalTables.php
View File

@@ -383,12 +383,20 @@ class AdditionalTables extends BaseAdditionalTables
eval('$fieldsTable = ' . $sClassPeerName . '::getFieldNames(BasePeer::TYPE_FIELDNAME);');
$countField = count($fieldsTable);
$stringOr = '$oCriteria->add(';
$cont = 1;
$cont = 0;
foreach ($fieldsTable as $value) {
if ($cont == $countField) {
if (($cont+1) == $countField) {
if ($aData['FIELDS'][$cont]['FLD_TYPE'] == 'VARCHAR') {
$stringOr .= '$oCriteria->getNewCriterion(' . $sClassPeerName . '::' . strtoupper($value) . ', "%' . $filter . '%", Criteria::LIKE)';
} else {
$stringOr .= '$oCriteria->getNewCriterion(' . $sClassPeerName . '::' . strtoupper($value) . ', "' . $filter . '", Criteria::LIKE)';
}
} else {
if ($aData['FIELDS'][$cont]['FLD_TYPE'] == 'VARCHAR') {
$stringOr .= '$oCriteria->getNewCriterion(' . $sClassPeerName . '::' . strtoupper($value) . ', "%' . $filter . '%", Criteria::LIKE)->addOr(';
} else {
$stringOr .= '$oCriteria->getNewCriterion(' . $sClassPeerName . '::' . strtoupper($value) . ', "' . $filter . '", Criteria::LIKE)->addOr(';
}
}
$cont++;
}

4
workflow/engine/methods/dynaforms/fields_Save.php
View File

@@ -236,6 +236,10 @@ foreach ($FieldAttributes as $key => $value) {
case 'string':
if (!empty($value)) {
$FieldAttrib[strtolower($key)] = $value;
} else {
if ($_POST["form"]["TYPE"] == "link" && $key == "TARGET_SEL") {
$FieldAttrib[strtolower($key)] = $value;
}
}
break;
case 'integer':

30
workflow/engine/methods/tasks/tasks_Ajax.php
View File

@@ -32,6 +32,7 @@ try {
$response = array ();
$oTask = new Task();
$aTaskInfo = $oTask->load($aData['TAS_UID']);
/**
* routine to replace @amp@ by &
@@ -46,7 +47,7 @@ try {
if (isset( $aData['SEND_EMAIL'] )) {
$aData['TAS_SEND_LAST_EMAIL'] = $aData['SEND_EMAIL'] == 'TRUE' ? 'TRUE' : 'FALSE';
} else {
$aTaskInfo = $oTask->load($aData['TAS_UID']);
//$aTaskInfo = $oTask->load($aData['TAS_UID']);
$aData['TAS_SEND_LAST_EMAIL'] = is_null($aTaskInfo['TAS_SEND_LAST_EMAIL']) ? 'FALSE' : $aTaskInfo['TAS_SEND_LAST_EMAIL'];
}
@@ -65,8 +66,21 @@ try {
}
//Validating TAS_ASSIGN_VARIABLE value
$sw = false;
if (!isset($aData['TAS_ASSIGN_TYPE'])) {
$sw = true;
if (isset($aTaskInfo['TAS_ASSIGN_TYPE'])) {
switch($aTaskInfo['TAS_ASSIGN_TYPE']) {
case 'SELF_SERVICE':
case 'SELF_SERVICE_EVALUATE':
$aData['TAS_ASSIGN_TYPE'] = ($aTaskInfo['TAS_GROUP_VARIABLE'] == '') ? 'SELF_SERVICE':'SELF_SERVICE_EVALUATE';
$aData['TAS_GROUP_VARIABLE'] = $aTaskInfo['TAS_GROUP_VARIABLE'];
break;
default:
$aData['TAS_ASSIGN_TYPE'] = $aTaskInfo['TAS_ASSIGN_TYPE'];
break;
}
} else {
$derivateType = $oTask->kgetassigType($_SESSION['PROCESS'],$aData['TAS_UID']);
if (is_null($derivateType)){
$aData['TAS_ASSIGN_TYPE'] = 'BALANCED';
@@ -74,6 +88,10 @@ try {
$aData['TAS_ASSIGN_TYPE'] = $derivateType['TAS_ASSIGN_TYPE'];
}
}
}
switch($aData['TAS_ASSIGN_TYPE']) {
case 'SELF_SERVICE':
case 'SELF_SERVICE_EVALUATE':
if ($aData['TAS_ASSIGN_TYPE'] == 'SELF_SERVICE_EVALUATE') {
$aData['TAS_ASSIGN_TYPE'] = 'SELF_SERVICE';
if(trim($aData['TAS_GROUP_VARIABLE']) == '') {
@@ -82,6 +100,14 @@ try {
} else {
$aData['TAS_GROUP_VARIABLE'] = '';
}
break;
default:
if (isset($aTaskInfo['TAS_ASSIGN_TYPE']) && $sw) {
$aData['TAS_ASSIGN_TYPE'] = $aTaskInfo['TAS_ASSIGN_TYPE'];
}
$aData['TAS_GROUP_VARIABLE'] = '';
break;
}
$result = $oTask->update( $aData );

3
workflow/engine/templates/cases/casesDocuments.js
View File

@@ -1911,6 +1911,9 @@ var documentsTab = {
'celldblclick' : {
fn : function(grid, rowIndex,
columnIndex, e) {
if (ext_itemgrid.getSelectionModel().getSelected().get('outDocGenerate') == '') {
openActionDialog(this, 'download', '');
}
if (Ext.isOpera) {
// because Opera <= 9
// doesn't support the

1
workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml
View File

@@ -143,6 +143,7 @@ if (aTaskFlag[1])
if (oTaskData.TAS_ASSIGN_TYPE == "SELF_SERVICE") {
getField("TAS_ASSIGN_TYPE][SELF_SERVICE").checked = true;
} else {
getField("TAS_GROUP_VARIABLE").value = oTaskData.TAS_GROUP_VARIABLE;
if (getField("TAS_ASSIGN_TYPE][SELF_SERVICE_EVALUATE")) {
getField("TAS_ASSIGN_TYPE][SELF_SERVICE_EVALUATE").checked = true;
}