fernando/tomolino-processmaker
3
0
Fork 0
Code Releases Activity

Added adhoc users re-assign rights

Browse Source 
Added possibility to assign a task to an adhoc user
Added task del_index tag to notification template
Added missing GLPI_ITEM_TASK_GROUP
Deleted extra-email sending
Fixed issue on users for re-assignment
Set version to 3.6.4
This commit is contained in:
tomolimo
2019-08-06 15:26:07 +02:00
parent e30ecf3a0b
commit fbd0239e4e
9 changed files with 67 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
inc/processmaker.class.php
View File

@@ -2913,6 +2913,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM {
$casevariables = ["GLPI_ITEM_TASK_CONTENT",
"GLPI_ITEM_APPEND_TO_TASK",
"GLPI_NEXT_GROUP_TO_BE_ASSIGNED",
"GLPI_ITEM_TASK_GROUP",
"GLPI_ITEM_TITLE",
"GLPI_TICKET_FOLLOWUP_CONTENT",
"GLPI_ITEM_FOLLOWUP_CONTENT",
@@ -2971,6 +2972,9 @@ class PluginProcessmakerProcessmaker extends CommonDBTM {
if (array_key_exists( 'GLPI_NEXT_GROUP_TO_BE_ASSIGNED', $casevariablevalues )) {
$groupId = $casevariablevalues[ 'GLPI_NEXT_GROUP_TO_BE_ASSIGNED' ];
}
if (array_key_exists( 'GLPI_ITEM_TASK_GROUP', $casevariablevalues )) {
$groupId = $casevariablevalues[ 'GLPI_ITEM_TASK_GROUP' ];
}
$taskStartDate = '';
$taskEndDate = '';
@@ -3237,16 +3241,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM {
}
}
// send email if requested
if (is_array($sendemail)) {
NotificationEvent::raiseEvent('send_email',
$myCase,
['glpi_send_email' => $sendemail,
'case' => $myCase
]);
}
}
}
} else {
// must check if current case is a sub-process, and if it has ended, then must reflect parent case into the current item.
@@ -3278,7 +3273,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM {
$parentCaseInfo,
$open_task->delIndex,
PluginProcessmakerUser::getGLPIUserId($open_task->userId),
0,
$groupId,
$open_task->taskId,
$open_task->delThread,
[ 'txtTaskContent' => $txtTaskContent,
@@ -3289,7 +3284,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM {
// if end date was specified, then must change due date of the PM task
if ($taskEndDate != '') {
$PM_DB->update('APP_DELEGATION', ['DEL_TASK_DUE_DATE' => $taskEndDate], ['AND' => ['APP_UID' => $sub_caseInfo->caseId, 'DEL_INDEX' => $open_task->delIndex]]);
$PM_DB->update('APP_DELEGATION', ['DEL_TASK_DUE_DATE' => $taskEndDate], ['AND' => ['APP_UID' => $parentCaseInfo->caseId, 'DEL_INDEX' => $open_task->delIndex]]);
//$PM_DB->query( "UPDATE APP_DELEGATION SET DEL_TASK_DUE_DATE='$taskEndDate' WHERE APP_UID='".$sub_caseInfo->caseId."' AND DEL_INDEX=".$open_task->delIndex);
}
}