From f1d6f3e5c257161c15156fa4a4a2162d053a14b4 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Wed, 25 Jan 2023 15:29:59 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B05905=20-=20Harmonize=20how=20known=20err?= =?UTF-8?q?ors=20are=20displayed=20in=20an=20object?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/cmdbabstract.class.inc.php | 2 +- .../datamodel.itop-incident-mgmt-itil.xml | 10 +++++++--- .../datamodel.itop-request-mgmt-itil.xml | 14 +++++++++----- .../datamodel.itop-request-mgmt.xml | 14 +++++++++----- 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 72dae8243b..b45e1f2b29 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -798,7 +798,7 @@ HTML $oBlock->Display($oPage, 'notifications_'.$sNotifClass, [ 'menu' => false, 'panel_title' => MetaModel::GetName($sNotifClass), - 'panel_icon' => MetaModel::GetClassIcon($sNotifClass), + 'panel_icon' => MetaModel::GetClassIcon($sNotifClass, false), ]); } } diff --git a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml index fca105a267..b542a9fe4d 100755 --- a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml +++ b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml @@ -1208,8 +1208,8 @@ { parent::DisplayBareRelations($oPage, $bEditMode); - if (MetaModel::IsValidClass('KnownError')) - { + $sKnownErrorClass = 'KnownError'; + if (MetaModel::IsValidClass($sKnownErrorClass)) { //Search for known errors $oPage->SetCurrentTab('Class:UserRequest:KnownErrorList'); $iTicketID = $this->GetKey();; @@ -1223,7 +1223,11 @@ { $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), + ]); } }]]> diff --git a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml index 76b6f72060..0281f453df 100755 --- a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml +++ b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml @@ -1365,13 +1365,13 @@ { parent::DisplayBareRelations($oPage, $bEditMode); - if (MetaModel::IsValidClass('KnownError')) - { + $sKnownErrorClass = 'KnownError'; + if (MetaModel::IsValidClass($sKnownErrorClass)) { //Search for known errors $oPage->SetCurrentTab('Class:UserRequest:KnownErrorList'); $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")); - $iNumberKE=$oKnownErrorSet->count(); + $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(); if ($iNumberKE > 0) { $oPage->SetCurrentTab('Class:UserRequest:KnownErrorList', Dict::S('Class:UserRequest:KnownErrorList')." ($iNumberKE)"); @@ -1380,7 +1380,11 @@ { $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), + ]); } }]]> diff --git a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml index 30676cb5fc..a05ba7f8ba 100755 --- a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml +++ b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml @@ -1408,13 +1408,13 @@ { parent::DisplayBareRelations($oPage, $bEditMode); - if (MetaModel::IsValidClass('KnownError')) - { + $sKnownErrorClass = 'KnownError'; + if (MetaModel::IsValidClass($sKnownErrorClass)) { //Search for known errors $oPage->SetCurrentTab('Class:UserRequest:KnownErrorList'); $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")); - $iNumberKE=$oKnownErrorSet->count(); + $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(); if ($iNumberKE > 0) { $oPage->SetCurrentTab('Class:UserRequest:KnownErrorList', Dict::S('Class:UserRequest:KnownErrorList')." ($iNumberKE)"); @@ -1423,7 +1423,11 @@ { $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), + ]); } }]]>