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

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source 
# Conflicts:
#	application/twigextension.class.inc.php
#	datamodels/2.x/authent-cas/composer.json
#	datamodels/2.x/authent-cas/composer.lock
#	datamodels/2.x/authent-cas/main.php
#	datamodels/2.x/authent-cas/vendor/apereo/phpcas/composer.json
#	datamodels/2.x/authent-cas/vendor/composer/ClassLoader.php
#	datamodels/2.x/authent-cas/vendor/composer/autoload_classmap.php
#	datamodels/2.x/authent-cas/vendor/composer/autoload_psr4.php
#	datamodels/2.x/authent-cas/vendor/composer/autoload_real.php
#	datamodels/2.x/authent-cas/vendor/composer/autoload_static.php
#	datamodels/2.x/authent-cas/vendor/composer/installed.json
#	datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
#	lib/apereo/phpcas/source/CAS.php
#	lib/apereo/phpcas/source/CAS/Client.php
#	lib/apereo/phpcas/source/CAS/Languages/Galego.php
#	lib/apereo/phpcas/source/CAS/Languages/Portuguese.php
#	lib/symfony/cache-contracts/InstalledVersions.php
#	lib/symfony/cache-contracts/installed.php
#	lib/symfony/cache-contracts/platform_check.php
#	sources/Application/UI/Base/Layout/NavigationMenu/NavigationMenu.php
#	sources/application/TwigBase/Twig/Extension.php
This commit is contained in:
Eric Espie
2022-11-24 13:00:38 +01:00
parent 038e6d7f3f df4a205ba0
commit 649674c786
46 changed files with 1685 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sources/Application/UI/Base/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php
View File

@@ -24,6 +24,7 @@ use AttributeDateTime;
use Combodo\iTop\Application\UI\Base\UIBlock;
use Combodo\iTop\Core\CMDBChange\CMDBChangeOrigin;
use DateTime;
use MetaModel;
use UserRights;
use utils;
@@ -74,6 +75,8 @@ class ActivityEntry extends UIBlock
*/
protected $sOrigin;
protected $bShowAuthorNameBelowEntries;
/**
* ActivityEntry constructor.
*
@@ -94,6 +97,7 @@ class ActivityEntry extends UIBlock
$this->SetDateTime($oDateTime);
$this->SetAuthor($sAuthorLogin);
$this->SetOrigin(static::DEFAULT_ORIGIN);
$this->SetShowAuthorNameBelowEntries(MetaModel::GetConfig()->Get('activity_panel.show_author_name_below_entries'));
}
/**
@@ -306,6 +310,22 @@ class ActivityEntry extends UIBlock
return $this->sOrigin;
}
/**
* @return mixed
*/
public function ShowAuthorNameBelowEntries(): bool
{
return $this->bShowAuthorNameBelowEntries;
}
/**
* @param bool $bShowAuthorNameBelowEntries
*/
public function SetShowAuthorNameBelowEntries($bShowAuthorNameBelowEntries): void
{
$this->bShowAuthorNameBelowEntries = $bShowAuthorNameBelowEntries;
}
/**
* @return string|null The CSS decoration classes for the origin of the entry
* @see \CMDBChangeOrigin