jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix avatar path for subdirectory installations (#1201)

Browse Source
This commit is contained in:
Kevin Papst
2019-10-30 14:00:48 +01:00
committed by GitHub
parent bda9584346
commit 48aefb1862
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/packages/assets.yaml
View File

@@ -1,3 +1,6 @@
framework: framework:
assets: assets:
json_manifest_path: '%kernel.project_dir%/public/build/manifest.json' json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
packages:
avatars:
base_path: 'avatars'

3
config/packages/framework.yaml
View File

@@ -29,6 +29,3 @@ framework:
#validation: #validation:
# possible values: 'loose', 'strict', 'html5' # possible values: 'loose', 'strict', 'html5'
#email_validation_mode: 'html5' #email_validation_mode: 'html5'
assets:
json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'

2
src/Twig/AvatarExtension.php
View File

@@ -54,6 +54,6 @@ class AvatarExtension extends AbstractExtension
return $this->packages->getUrl($default); return $this->packages->getUrl($default);
} }
return $this->packages->getUrl($url); return $this->packages->getUrl($url, 'avatars');
} }
} }

6
src/Utils/AvatarService.php
View File

@@ -110,14 +110,14 @@ class AvatarService
private function getAvatarUrl(User $profile): string private function getAvatarUrl(User $profile): string
{ {
return '/avatars/' . md5($profile->getId() . '_' . $profile->getDisplayName()) . '.png'; return md5($profile->getId() . '_' . $profile->getDisplayName()) . '.png';
} }
private function getImagePath(User $profile): string private function getImagePath(User $profile): string
{ {
$avatarPath = realpath($this->projectDirectory . '/public/'); $avatarPath = realpath($this->projectDirectory . '/public/avatars/');
return $avatarPath . $this->getAvatarUrl($profile); return $avatarPath . '/' . $this->getAvatarUrl($profile);
} }
public function generateAvatar(User $profile, bool $regenerate = false): bool public function generateAvatar(User $profile, bool $regenerate = false): bool