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

N.490 Losing carrier returns and rich text formatting when the latest comments are copied to child tickets

Browse Source 
SVN:trunk[4501]
This commit is contained in:
Romain Quetiez
2016-12-08 10:24:06 +00:00
parent c5a00a1bf1
commit 4ec3aeec92
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -639,12 +639,12 @@ class ormCaseLog {
}
public function GetModifiedEntry()
public function GetModifiedEntry($sFormat = 'text')
{
$sModifiedEntry = '';
if ($this->m_bModified)
{
$sModifiedEntry = $this->GetLatestEntry();
$sModifiedEntry = $this->GetLatestEntry($sFormat);
}
return $sModifiedEntry;
}

8
datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
View File

@@ -1229,7 +1229,7 @@
if (!MetaModel::IsValidClass('UserRequest')) return true; // Do nothing
$oLog = $this->Get('public_log');
$sLogPublic = $oLog->GetModifiedEntry();
$sLogPublic = $oLog->GetModifiedEntry('html');
if ($sLogPublic != '')
{
$sOQL = "SELECT UserRequest WHERE parent_incident_id=:ticket";
@@ -1247,7 +1247,7 @@
}
$oLog = $this->Get('private_log');
$sLogPrivate = $oLog->GetModifiedEntry();
$sLogPrivate = $oLog->GetModifiedEntry('html');
if ($sLogPrivate != '')
{
$sOQL = "SELECT UserRequest WHERE parent_incident_id=:ticket";
@@ -1274,7 +1274,7 @@
<code><![CDATA[ public function UpdateChildIncidentLog()
{
$oLog = $this->Get('public_log');
$sLogPublic = $oLog->GetModifiedEntry();
$sLogPublic = $oLog->GetModifiedEntry('html');
if ($sLogPublic != '')
{
$sOQL = "SELECT Incident WHERE parent_incident_id=:ticket";
@@ -1292,7 +1292,7 @@
}
$oLog = $this->Get('private_log');
$sLogPrivate = $oLog->GetModifiedEntry();
$sLogPrivate = $oLog->GetModifiedEntry('html');
if ($sLogPrivate != '')
{
$sOQL = "SELECT Incident WHERE parent_incident_id=:ticket";

4
datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
View File

@@ -1325,7 +1325,7 @@
<code><![CDATA[ public function UpdateChildRequestLog()
{
$oLog = $this->Get('public_log');
$sLogPublic = $oLog->GetModifiedEntry();
$sLogPublic = $oLog->GetModifiedEntry('html');
if ($sLogPublic != '')
{
$sOQL = "SELECT UserRequest WHERE parent_request_id=:ticket";
@@ -1343,7 +1343,7 @@
}
$oLog = $this->Get('private_log');
$sLogPrivate = $oLog->GetModifiedEntry();
$sLogPrivate = $oLog->GetModifiedEntry('html');
if ($sLogPrivate != '')
{
$sOQL = "SELECT UserRequest WHERE parent_request_id=:ticket";

4
datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
View File

@@ -1338,7 +1338,7 @@
<code><![CDATA[ public function UpdateChildRequestLog()
{
$oLog = $this->Get('public_log');
$sLogPublic = $oLog->GetModifiedEntry();
$sLogPublic = $oLog->GetModifiedEntry('html');
if ($sLogPublic != '')
{
$sOQL = "SELECT UserRequest WHERE parent_request_id=:ticket";
@@ -1356,7 +1356,7 @@
}
$oLog = $this->Get('private_log');
$sLogPrivate = $oLog->GetModifiedEntry();
$sLogPrivate = $oLog->GetModifiedEntry('html');
if ($sLogPrivate != '')
{
$sOQL = "SELECT UserRequest WHERE parent_request_id=:ticket";

2
datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
View File

@@ -698,7 +698,7 @@
<code><![CDATA[ public function UpdateParentTicketLog()
{
$oLog = $this->Get('log');
$sLog = $oLog->GetModifiedEntry();
$sLog = $oLog->GetModifiedEntry('html');
if ($sLog != '')
{
$oTicket = MetaModel::GetObject('Ticket', $this->Get('ticket_id'), false);