mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-24 02:58:43 +02:00
Compare commits
4 Commits
2.6.0-prod
...
2.6.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5d09841cd5 | ||
|
|
11ec46c18b | ||
|
|
2b563d4fc8 | ||
|
|
2773a8bf2f |
@@ -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));
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -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">
|
||||||
|
|||||||
@@ -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">
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
For installation instructions, please refer to:
|
For installation instructions, please refer to:
|
||||||
|
|
||||||
https://wiki.openitop.org/doku.php?id=2_4_0:install:start
|
https://wiki.openitop.org/doku.php?id=2_6_0:install:start
|
||||||
@@ -308,12 +308,12 @@ class iTopExtensionsMap
|
|||||||
$sModuleVersion = '0.0.1';
|
$sModuleVersion = '0.0.1';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($sParentExtensionId !== null)
|
if (($sParentExtensionId !== null) && (array_key_exists($sParentExtensionId, $this->aExtensions)) && ($this->aExtensions[$sParentExtensionId] instanceof iTopExtension))
|
||||||
{
|
{
|
||||||
// Already inside an extension, let's add this module the list of modules belonging to this extension
|
// Already inside an extension, let's add this module the list of modules belonging to this extension
|
||||||
$this->aExtensions[$sParentExtensionId]->aModules[] = $sModuleName;
|
$this->aExtensions[$sParentExtensionId]->aModules[] = $sModuleName;
|
||||||
$this->aExtensions[$sParentExtensionId]->aModuleVersion[$sModuleName] = $sModuleVersion;
|
$this->aExtensions[$sParentExtensionId]->aModuleVersion[$sModuleName] = $sModuleVersion;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Not already inside an folder containing an 'extension.xml' file
|
// Not already inside an folder containing an 'extension.xml' file
|
||||||
|
|||||||
Reference in New Issue
Block a user