From f9ac07830e6d01528247c4a36749a23a9077442d Mon Sep 17 00:00:00 2001 From: acognet Date: Thu, 4 Aug 2022 16:26:01 +0200 Subject: [PATCH 1/2] Fix translation --- dictionaries/en.dictionary.itop.core.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dictionaries/en.dictionary.itop.core.php b/dictionaries/en.dictionary.itop.core.php index d49eba723..bbbf41b2a 100644 --- a/dictionaries/en.dictionary.itop.core.php +++ b/dictionaries/en.dictionary.itop.core.php @@ -356,9 +356,9 @@ Dict::Add('EN US', 'English', 'English', array( 'Class:EventNotification' => 'Notification event', 'Class:EventNotification+' => 'Trace of a notification that has been sent', 'Class:EventNotification/Attribute:trigger_id' => 'Trigger', - 'Class:EventNotification/Attribute:trigger_id+' => 'user account', - 'Class:EventNotification/Attribute:action_id' => 'user', - 'Class:EventNotification/Attribute:action_id+' => 'user account', + 'Class:EventNotification/Attribute:trigger_id+' => '', + 'Class:EventNotification/Attribute:action_id' => 'action', + 'Class:EventNotification/Attribute:action_id+' => '', 'Class:EventNotification/Attribute:object_id' => 'Object id', 'Class:EventNotification/Attribute:object_id+' => 'object id (class defined by the trigger ?)', )); From bb861aa262cfb82fea525fc6325e450668501722 Mon Sep 17 00:00:00 2001 From: acognet Date: Thu, 4 Aug 2022 16:26:21 +0200 Subject: [PATCH 2/2] =?UTF-8?q?N=C2=B03024=20-=20Archiving=20Service=20Fam?= =?UTF-8?q?ilies=20(or=20any=20class=20with=20no=20child)=20with=20combodo?= =?UTF-8?q?-archive-manual?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/dbsearch.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/dbsearch.class.php b/core/dbsearch.class.php index 406161dd0..81f615d4e 100644 --- a/core/dbsearch.class.php +++ b/core/dbsearch.class.php @@ -1623,7 +1623,7 @@ abstract class DBSearch $oSet = new DBObjectSet($this); if (MetaModel::IsStandaloneClass($sClass)) { - $oSet->OptimizeColumnLoad(array($this->GetClassAlias() => array(''))); + $oSet->OptimizeColumnLoad(array($this->GetClassAlias() => array())); $aIds = array($sClass => $oSet->GetColumnAsArray('id')); } else