composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 18:48:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename cmdbAbstractObject::EnumDisplayMode() to be consistent with the rest

Browse Source
This commit is contained in:
Molkobain
2021-11-16 21:38:51 +01:00
parent d0f9868a19
commit 91d030933b
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 * @see static::ENUM_DISPLAY_MODE_XXX
* *
* @return string[] * @return string[]
* @since 3.0.0 * @since 3.0.0
*/ */
public static function EnumObjectModes(): array public static function EnumDisplayModes(): array
{ {
return [ return [
static::ENUM_DISPLAY_MODE_VIEW, static::ENUM_DISPLAY_MODE_VIEW,

4
sources/application/UI/Base/Layout/ActivityPanel/ActivityPanel.php
View File

@@ -192,8 +192,8 @@ class ActivityPanel extends UIBlock
public function SetObjectMode(string $sMode) public function SetObjectMode(string $sMode)
{ {
// Consistency check // Consistency check
if(!in_array($sMode, cmdbAbstractObject::EnumObjectModes())){ if(!in_array($sMode, cmdbAbstractObject::EnumDisplayModes())){
throw new Exception("Activity panel: Object mode '$sMode' not allowed, should be either ".implode(' / ', cmdbAbstractObject::EnumObjectModes())); throw new Exception("Activity panel: Object mode '$sMode' not allowed, should be either ".implode(' / ', cmdbAbstractObject::EnumDisplayModes()));
} }
$this->sObjectMode = $sMode; $this->sObjectMode = $sMode;

8
sources/application/UI/Base/Layout/ActivityPanel/ActivityPanelHelper.php
View File

@@ -48,8 +48,8 @@ class ActivityPanelHelper
throw new Exception('"'.$sObjectClass.'" must be a valid class.'); throw new Exception('"'.$sObjectClass.'" must be a valid class.');
} }
if (false === in_array($sObjectMode, cmdbAbstractObject::EnumObjectModes())) { if (false === in_array($sObjectMode, cmdbAbstractObject::EnumDisplayModes())) {
throw new Exception('Wrong object mode "'.$sObjectMode.'", must be among '.implode(' / ', cmdbAbstractObject::EnumObjectModes())); throw new Exception('Wrong object mode "'.$sObjectMode.'", must be among '.implode(' / ', cmdbAbstractObject::EnumDisplayModes()));
} }
$aStates = appUserPreferences::GetPref('activity_panel.is_expanded', []); $aStates = appUserPreferences::GetPref('activity_panel.is_expanded', []);
@@ -75,8 +75,8 @@ class ActivityPanelHelper
throw new Exception('"'.$sObjectClass.'" must be a valid class.'); throw new Exception('"'.$sObjectClass.'" must be a valid class.');
} }
if (false === in_array($sObjectMode, cmdbAbstractObject::EnumObjectModes())) { if (false === in_array($sObjectMode, cmdbAbstractObject::EnumDisplayModes())) {
throw new Exception('Wrong object mode "'.$sObjectMode.'", must be among '.implode(' / ', cmdbAbstractObject::EnumObjectModes())); throw new Exception('Wrong object mode "'.$sObjectMode.'", must be among '.implode(' / ', cmdbAbstractObject::EnumDisplayModes()));
} }
$aStates = appUserPreferences::GetPref('activity_panel.is_closed', []); $aStates = appUserPreferences::GetPref('activity_panel.is_closed', []);