composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eric Espie
2024-06-20 11:08:59 +02:00
parent 055968bea9 6b2476d220
commit 03f4e9f621
37 changed files with 1045 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sources/Application/UI/Base/Layout/NavigationMenu/NavigationMenu.php
View File

@@ -454,10 +454,7 @@ JS;
protected function ComputeUserData()
{
// Use a picture set in the preferences is there is none in the user's contact
$sPictureUrl = UserRights::GetUserPictureAbsUrl('', false);
if (empty($sPictureUrl)) {
$sPictureUrl = utils::GetAbsoluteUrlAppRoot().'images/user-pictures/'.appUserPreferences::GetPref('user_picture_placeholder', 'user-profile-default-256px.png');
}
$sPictureUrl = UserRights::GetUserPictureAbsUrl();
// TODO 3.0.0 : what do we show if no contact is linked to the user ?
$aData = [

3
sources/Dependencies/Composer/iTopComposer.php
View File

@@ -64,6 +64,9 @@ class iTopComposer extends AbstractFolderAnalyzer
'psr/log/Psr/Log/Test',
'soundasleep/html2text/.github',
'soundasleep/html2text/tests',
'symfony/cache/Tests',
'symfony/cache/Tests/DoctrineProviderTest.php',
'symfony/class-loader/Tests',

2
sources/Form/Validator/MultipleChoicesValidator.php
View File

@@ -53,7 +53,7 @@ class MultipleChoicesValidator extends AbstractValidator
private function CheckValueAgainstChoices(string $sValue, array &$aErrorMessages): void
{
if (false === array_key_exists($sValue, $this->aChoices)) {
$aErrorMessages[] = "Value ({$sValue}) is not part of the field possible values list";
$aErrorMessages[] = "Value ({$sValue}) is not part of the field possible values list";
}
}
}