diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 19aba73d3..1a06e9a87 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -193,14 +193,14 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay } /** - * Return the allowed object modes + * Return the allowed display modes * * @see static::ENUM_DISPLAY_MODE_XXX * * @return string[] * @since 3.0.0 */ - public static function EnumObjectModes(): array + public static function EnumDisplayModes(): array { return [ static::ENUM_DISPLAY_MODE_VIEW, diff --git a/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanel.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanel.php index 454f5fbfa..5570d0fd9 100644 --- a/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanel.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanel.php @@ -192,8 +192,8 @@ class ActivityPanel extends UIBlock public function SetObjectMode(string $sMode) { // Consistency check - if(!in_array($sMode, cmdbAbstractObject::EnumObjectModes())){ - throw new Exception("Activity panel: Object mode '$sMode' not allowed, should be either ".implode(' / ', cmdbAbstractObject::EnumObjectModes())); + if(!in_array($sMode, cmdbAbstractObject::EnumDisplayModes())){ + throw new Exception("Activity panel: Object mode '$sMode' not allowed, should be either ".implode(' / ', cmdbAbstractObject::EnumDisplayModes())); } $this->sObjectMode = $sMode; diff --git a/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanelHelper.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanelHelper.php index 8e737044f..96f1ca41a 100644 --- a/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanelHelper.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanelHelper.php @@ -48,8 +48,8 @@ class ActivityPanelHelper throw new Exception('"'.$sObjectClass.'" must be a valid class.'); } - if (false === in_array($sObjectMode, cmdbAbstractObject::EnumObjectModes())) { - throw new Exception('Wrong object mode "'.$sObjectMode.'", must be among '.implode(' / ', cmdbAbstractObject::EnumObjectModes())); + if (false === in_array($sObjectMode, cmdbAbstractObject::EnumDisplayModes())) { + throw new Exception('Wrong object mode "'.$sObjectMode.'", must be among '.implode(' / ', cmdbAbstractObject::EnumDisplayModes())); } $aStates = appUserPreferences::GetPref('activity_panel.is_expanded', []); @@ -75,8 +75,8 @@ class ActivityPanelHelper throw new Exception('"'.$sObjectClass.'" must be a valid class.'); } - if (false === in_array($sObjectMode, cmdbAbstractObject::EnumObjectModes())) { - throw new Exception('Wrong object mode "'.$sObjectMode.'", must be among '.implode(' / ', cmdbAbstractObject::EnumObjectModes())); + if (false === in_array($sObjectMode, cmdbAbstractObject::EnumDisplayModes())) { + throw new Exception('Wrong object mode "'.$sObjectMode.'", must be among '.implode(' / ', cmdbAbstractObject::EnumDisplayModes())); } $aStates = appUserPreferences::GetPref('activity_panel.is_closed', []);