composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-03-05 17:14:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°3803 Fix error when opening dashboard page with non admin user

Browse Source
This commit is contained in:
Pierre Goiffon
2021-03-09 12:32:18 +01:00
parent 570b012000
commit fa7d316dbf
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sources/application/UI/Base/Component/Dashlet/DashletBadge.php
View File

@@ -44,10 +44,14 @@ class DashletBadge extends DashletContainer
* @param string $sHyperlink
* @param string $iCount
* @param string $sClassLabel
* @param string $sCreateActionUrl
* @param string $sCreateActionLabel
* @param string|null $sCreateActionUrl
* @param string|null $sCreateActionLabel
* @param array $aRefreshParams
*/
public function __construct(string $sClassIconUrl, string $sHyperlink, string $iCount, string $sClassLabel, string $sCreateActionUrl = '', string $sCreateActionLabel = '', array $aRefreshParams)
public function __construct(
string $sClassIconUrl, string $sHyperlink, string $iCount, string $sClassLabel, ?string $sCreateActionUrl = '',
?string $sCreateActionLabel = '', array $aRefreshParams = []
)
{
parent::__construct();
@@ -64,17 +68,17 @@ class DashletBadge extends DashletContainer
/**
* @return string
*/
public function GetCreateActionUrl(): string
public function GetCreateActionUrl(): ?string
{
return $this->sCreateActionUrl;
}
/**
* @param string $sCreateActionUrl
* @param string|null $sCreateActionUrl
*
* @return DashletBadge
*/
public function SetCreateActionUrl(string $sCreateActionUrl): DashletBadge
public function SetCreateActionUrl(?string $sCreateActionUrl): DashletBadge
{
$this->sCreateActionUrl = $sCreateActionUrl;
@@ -84,17 +88,17 @@ class DashletBadge extends DashletContainer
/**
* @return string
*/
public function GetCreateActionLabel(): string
public function GetCreateActionLabel(): ?string
{
return $this->sCreateActionLabel;
}
/**
* @param string $sCreateActionLabel
* @param string|null $sCreateActionLabel
*
* @return DashletBadge
*/
public function SetCreateActionLabel(string $sCreateActionLabel): DashletBadge
public function SetCreateActionLabel(?string $sCreateActionLabel): DashletBadge
{
$this->sCreateActionLabel = $sCreateActionLabel;

5
sources/application/UI/Base/Component/Dashlet/DashletFactory.php
View File

@@ -10,7 +10,10 @@ namespace Combodo\iTop\Application\UI\Base\Component\Dashlet;
class DashletFactory
{
public static function MakeForDashletBadge(string $sClassIconUrl, string $sHyperlink, string $iCount, string $sClassLabel, string $sCreateActionUrl = '', string $sCreateActionLabel = '', array $aRefreshParams = [])
public static function MakeForDashletBadge(
string $sClassIconUrl, string $sHyperlink, string $iCount, string $sClassLabel, ?string $sCreateActionUrl = '',
?string $sCreateActionLabel = '', array $aRefreshParams = []
)
{
return new DashletBadge($sClassIconUrl, $sHyperlink, $iCount, $sClassLabel, $sCreateActionUrl, $sCreateActionLabel, $aRefreshParams);
}