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

Merge remote-tracking branch 'origin/release/2.6.0-community' into release/2.6

Browse Source 
# Conflicts:
#	install.txt
This commit is contained in:
Pierre Goiffon
2019-01-09 17:23:43 +01:00
parent a85bedd31c 5d09841cd5
commit 340cacc691
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/inlineimage.class.inc.php
View File

@@ -178,18 +178,19 @@ class InlineImage extends DBObject
$oInlineImage->DBUpdate(); $oInlineImage->DBUpdate();
} }
} }
else // For tracing issues with Inline Images... but beware not all updates are interactive, so this trace happens when creating objects non-interactively (REST, Synchro...)
{ // else
IssueLog::Error('InlineImage: Error during FinalizeInlineImages(), no transaction ID for object '.get_class($oObject).'#'.$oObject->GetKey().'.'); // {
// IssueLog::Error('InlineImage: Error during FinalizeInlineImages(), no transaction ID for object '.get_class($oObject).'#'.$oObject->GetKey().'.');
IssueLog::Error('|- Call stack:'); //
$oException = new Exception(); // IssueLog::Error('|- Call stack:');
$sStackTrace = $oException->getTraceAsString(); // $oException = new Exception();
IssueLog::Error($sStackTrace); // $sStackTrace = $oException->getTraceAsString();
// IssueLog::Error($sStackTrace);
IssueLog::Error('|- POST vars:'); //
IssueLog::Error(print_r($_POST, true)); // IssueLog::Error('|- POST vars:');
} // IssueLog::Error(print_r($_POST, true));
// }
} }
/** /**

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

@@ -1725,7 +1725,7 @@
</class> </class>
<class id="Organization"> <class id="Organization">
<fields> <fields>
<field id="overview" xsi:type="AttributeDashboard"> <field id="overview" xsi:type="AttributeDashboard" _delta="if_exists">
<definition> <definition>
<cells> <cells>
<cell id="9000" _delta="delete"> <cell id="9000" _delta="delete">

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

@@ -1747,7 +1747,7 @@
</class> </class>
<class id="Organization"> <class id="Organization">
<fields> <fields>
<field id="overview" xsi:type="AttributeDashboard"> <field id="overview" xsi:type="AttributeDashboard" _delta="if_exists">
<definition> <definition>
<cells> <cells>
<cell id="9000" _delta="delete"> <cell id="9000" _delta="delete">