Jelajahi Sumber

Fixed bug: CSV import (interactive or web service) reporting change "on behalf of"

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@742 a333f486-631f-4898-b8df-5754b55c2be0
romainq 14 tahun lalu
induk
melakukan
ed52d94cd0
2 mengubah file dengan 4 tambahan dan 4 penghapusan
  1. 2 2
      pages/csvimport.php
  2. 2 2
      webservices/import.php

+ 2 - 2
pages/csvimport.php

@@ -314,9 +314,9 @@ function ProcessCSVData(WebPage $oPage, $bSimulate = true)
 		// We're doing it for real, let's create a change
 		$oMyChange = MetaModel::NewObject("CMDBChange");
 		$oMyChange->Set("date", time());
-		if (UserRights::GetUser() != UserRights::GetRealUser())
+		if (UserRights::IsImpersonated())
 		{
-			$sUserString = UserRights::GetRealUser()." on behalf of ".UserRights::GetUser();
+			$sUserString = Dict::Format('UI:Archive_User_OnBehalfOf_User', UserRights::GetRealUser(), UserRights::GetUser());
 		}
 		else
 		{

+ 2 - 2
webservices/import.php

@@ -112,9 +112,9 @@ try
 
 	$oMyChange = MetaModel::NewObject("CMDBChange");
 	$oMyChange->Set("date", time());
-	if (UserRights::GetUser() != UserRights::GetRealUser())
+	if (UserRights::IsImpersonated())
 	{
-		$sUserString = UserRights::GetRealUser()." on behalf of ".UserRights::GetUser();
+		$sUserString = Dict::Format('UI:Archive_User_OnBehalfOf_User', UserRights::GetRealUser(), UserRights::GetUser());
 	}
 	else
 	{