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

N°5905 - Harmonize how known errors are displayed in an object

Browse Source
This commit is contained in:
Molkobain
2023-01-25 15:29:59 +01:00
parent 834c4a2654
commit f1d6f3e5c2
4 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/cmdbabstract.class.inc.php
View File

@@ -798,7 +798,7 @@ HTML
$oBlock->Display($oPage, 'notifications_'.$sNotifClass, [ $oBlock->Display($oPage, 'notifications_'.$sNotifClass, [
'menu' => false, 'menu' => false,
'panel_title' => MetaModel::GetName($sNotifClass), 'panel_title' => MetaModel::GetName($sNotifClass),
'panel_icon' => MetaModel::GetClassIcon($sNotifClass), 'panel_icon' => MetaModel::GetClassIcon($sNotifClass, false),
]); ]);
} }
} }

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

@@ -1208,8 +1208,8 @@
{ {
parent::DisplayBareRelations($oPage, $bEditMode); parent::DisplayBareRelations($oPage, $bEditMode);
if (MetaModel::IsValidClass('KnownError')) $sKnownErrorClass = 'KnownError';
{ if (MetaModel::IsValidClass($sKnownErrorClass)) {
//Search for known errors //Search for known errors
$oPage->SetCurrentTab('Class:UserRequest:KnownErrorList'); $oPage->SetCurrentTab('Class:UserRequest:KnownErrorList');
$iTicketID = $this->GetKey();; $iTicketID = $this->GetKey();;
@@ -1223,7 +1223,11 @@
{ {
$oPage->SetCurrentTab('Class:UserRequest:KnownErrorList'); $oPage->SetCurrentTab('Class:UserRequest:KnownErrorList');
} }
self::DisplaySet($oPage, $oKnownErrorSet, array ('menu' => false)); self::DisplaySet($oPage, $oKnownErrorSet, [
'menu' => false,
'panel_title' => Dict::S('Class:UserRequest:KnownErrorList'),
'panel_icon' => MetaModel::GetClassIcon($sKnownErrorClass, false),
]);
} }
}]]></code> }]]></code>
</method> </method>

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

@@ -1365,12 +1365,12 @@
{ {
parent::DisplayBareRelations($oPage, $bEditMode); parent::DisplayBareRelations($oPage, $bEditMode);
if (MetaModel::IsValidClass('KnownError')) $sKnownErrorClass = 'KnownError';
{ if (MetaModel::IsValidClass($sKnownErrorClass)) {
//Search for known errors //Search for known errors
$oPage->SetCurrentTab('Class:UserRequest:KnownErrorList'); $oPage->SetCurrentTab('Class:UserRequest:KnownErrorList');
$iTicketID = $this->GetKey();; $iTicketID = $this->GetKey();;
$oKnownErrorSet = new CMDBObjectSet(DBObjectSearch::FromOQL("SELECT KnownError AS ke JOIN lnkErrorToFunctionalCI AS l1 ON l1.error_id=ke.id JOIN FunctionalCI AS ci ON l1.functionalci_id=ci.id JOIN lnkFunctionalCIToTicket AS l2 ON l2.functionalci_id=ci.id WHERE l2.ticket_id=$iTicketID")); $oKnownErrorSet = new CMDBObjectSet(DBObjectSearch::FromOQL("SELECT $sKnownErrorClass AS ke JOIN lnkErrorToFunctionalCI AS l1 ON l1.error_id=ke.id JOIN FunctionalCI AS ci ON l1.functionalci_id=ci.id JOIN lnkFunctionalCIToTicket AS l2 ON l2.functionalci_id=ci.id WHERE l2.ticket_id=$iTicketID"));
$iNumberKE = $oKnownErrorSet->count(); $iNumberKE = $oKnownErrorSet->count();
if ($iNumberKE > 0) if ($iNumberKE > 0)
{ {
@@ -1380,7 +1380,11 @@
{ {
$oPage->SetCurrentTab('Class:UserRequest:KnownErrorList'); $oPage->SetCurrentTab('Class:UserRequest:KnownErrorList');
} }
self::DisplaySet($oPage, $oKnownErrorSet, array ('menu' => false)); self::DisplaySet($oPage, $oKnownErrorSet, [
'menu' => false,
'panel_title' => Dict::S('Class:UserRequest:KnownErrorList'),
'panel_icon' => MetaModel::GetClassIcon($sKnownErrorClass, false),
]);
} }
}]]></code> }]]></code>
</method> </method>

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

@@ -1408,12 +1408,12 @@
{ {
parent::DisplayBareRelations($oPage, $bEditMode); parent::DisplayBareRelations($oPage, $bEditMode);
if (MetaModel::IsValidClass('KnownError')) $sKnownErrorClass = 'KnownError';
{ if (MetaModel::IsValidClass($sKnownErrorClass)) {
//Search for known errors //Search for known errors
$oPage->SetCurrentTab('Class:UserRequest:KnownErrorList'); $oPage->SetCurrentTab('Class:UserRequest:KnownErrorList');
$iTicketID = $this->GetKey();; $iTicketID = $this->GetKey();;
$oKnownErrorSet = new CMDBObjectSet(DBObjectSearch::FromOQL("SELECT KnownError AS ke JOIN lnkErrorToFunctionalCI AS l1 ON l1.error_id=ke.id JOIN FunctionalCI AS ci ON l1.functionalci_id=ci.id JOIN lnkFunctionalCIToTicket AS l2 ON l2.functionalci_id=ci.id WHERE l2.ticket_id=$iTicketID")); $oKnownErrorSet = new CMDBObjectSet(DBObjectSearch::FromOQL("SELECT $sKnownErrorClass AS ke JOIN lnkErrorToFunctionalCI AS l1 ON l1.error_id=ke.id JOIN FunctionalCI AS ci ON l1.functionalci_id=ci.id JOIN lnkFunctionalCIToTicket AS l2 ON l2.functionalci_id=ci.id WHERE l2.ticket_id=$iTicketID"));
$iNumberKE = $oKnownErrorSet->count(); $iNumberKE = $oKnownErrorSet->count();
if ($iNumberKE > 0) if ($iNumberKE > 0)
{ {
@@ -1423,7 +1423,11 @@
{ {
$oPage->SetCurrentTab('Class:UserRequest:KnownErrorList'); $oPage->SetCurrentTab('Class:UserRequest:KnownErrorList');
} }
self::DisplaySet($oPage, $oKnownErrorSet, array ('menu' => false)); self::DisplaySet($oPage, $oKnownErrorSet, [
'menu' => false,
'panel_title' => Dict::S('Class:UserRequest:KnownErrorList'),
'panel_icon' => MetaModel::GetClassIcon($sKnownErrorClass, false),
]);
} }
}]]></code> }]]></code>
</method> </method>