composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 00:02:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Enhancement: allow the API to create entries with a specified user_login.

Browse Source 
SVN:2.1.1[3515]
This commit is contained in:
Denis Flaven
2015-03-24 17:08:03 +00:00
parent 4c25362b84
commit 88665da96e
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/ormcaselog.class.inc.php
View File

@@ -384,7 +384,7 @@ class ormCaseLog {
} }
public function AddLogEntryFromJSON($oJson) public function AddLogEntryFromJSON($oJson, $bCheckUserId = true)
{ {
$sText = isset($oJson->message) ? $oJson->message : ''; $sText = isset($oJson->message) ? $oJson->message : '';
@@ -394,6 +394,8 @@ class ormCaseLog {
{ {
throw new Exception("Only administrators can set the user id", RestResult::UNAUTHORIZED); throw new Exception("Only administrators can set the user id", RestResult::UNAUTHORIZED);
} }
if ($bCheckUserId)
{
try try
{ {
$oUser = RestUtils::FindObjectFromKey('User', $oJson->user_id); $oUser = RestUtils::FindObjectFromKey('User', $oJson->user_id);
@@ -406,6 +408,12 @@ class ormCaseLog {
$sOnBehalfOf = $oUser->GetFriendlyName(); $sOnBehalfOf = $oUser->GetFriendlyName();
} }
else else
{
$iUserId = $oJson->user_id;
$sOnBehalfOf = $oJson->user_login;
}
}
else
{ {
$iUserId = UserRights::GetUserId(); $iUserId = UserRights::GetUserId();
$sOnBehalfOf = UserRights::GetUserFriendlyName(); $sOnBehalfOf = UserRights::GetUserFriendlyName();