mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-28 17:48:56 +01:00
galaxia workflow bugfix: non interactive activities should not set the user to the actual user, the user having the role on this activity (to make a manual send for example) can be a different one as this actual user is the one having a role on the prev interactive activity
This commit is contained in:
parent
bd9f34dbd3
commit
fd9d1b1ceb
@ -13,7 +13,7 @@ if(empty($instance->instanceId)) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Set the current user for this activity
|
// Set the current user for this activity
|
||||||
if(isset($GLOBALS['user']) && !empty($instance->instanceId) && !empty($activity_id)) {
|
if(isset($GLOBALS['user']) && ($activity->isInteractive()) && !empty($instance->instanceId) && !empty($activity_id)) {
|
||||||
$instance->setActivityUser($activity_id,$GLOBALS['user']);
|
$instance->setActivityUser($activity_id,$GLOBALS['user']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ if(empty($instance->instanceId)) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Set the current user for this activity
|
// Set the current user for this activity
|
||||||
if(isset($GLOBALS['user']) && !empty($instance->instanceId) && !empty($activity_id)) {
|
if(isset($GLOBALS['user']) && ($activity->isInteractive()) && !empty($instance->instanceId) && !empty($activity_id)) {
|
||||||
$instance->setActivityUser($activity_id,$GLOBALS['user']);
|
$instance->setActivityUser($activity_id,$GLOBALS['user']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ if(empty($instance->instanceId)) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Set the current user for this activity
|
// Set the current user for this activity
|
||||||
if(isset($GLOBALS['user']) && !empty($instance->instanceId) && !empty($activity_id)) {
|
if(isset($GLOBALS['user']) && ($activity->isInteractive()) && !empty($instance->instanceId) && !empty($activity_id)) {
|
||||||
$instance->setActivityUser($activity_id,$GLOBALS['user']);
|
$instance->setActivityUser($activity_id,$GLOBALS['user']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ if(empty($instance->instanceId)) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Set the current user for this activity
|
// Set the current user for this activity
|
||||||
if(isset($GLOBALS['user']) && !empty($instance->instanceId) && !empty($activity_id)) {
|
if(isset($GLOBALS['user']) && ($activity->isInteractive()) && !empty($instance->instanceId) && !empty($activity_id)) {
|
||||||
$instance->setActivityUser($activity_id,$GLOBALS['user']);
|
$instance->setActivityUser($activity_id,$GLOBALS['user']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ if(empty($instance->instanceId)) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Set the current user for this activity
|
// Set the current user for this activity
|
||||||
if(isset($GLOBALS['user']) && !empty($instance->instanceId) && !empty($activity_id)) {
|
if(isset($GLOBALS['user']) && ($activity->isInteractive()) && !empty($instance->instanceId) && !empty($activity_id)) {
|
||||||
$instance->setActivityUser($activity_id,$GLOBALS['user']);
|
$instance->setActivityUser($activity_id,$GLOBALS['user']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user