Compare commits
3 Commits
7b45069904
...
d707c20ab6
Author | SHA1 | Date | |
---|---|---|---|
d707c20ab6 | |||
49d72f1d48 | |||
eabf17cb77 |
@ -10,7 +10,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"esoko/soko-web": "0.6",
|
"esoko/soko-web": "0.7",
|
||||||
"firebase/php-jwt": "^6.4"
|
"firebase/php-jwt": "^6.4"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
|
8
composer.lock
generated
8
composer.lock
generated
@ -4,15 +4,15 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "7b9e3854a5b7ef69d360c1dfbac75c17",
|
"content-hash": "71f3adc97b2d83ac1d57112ecce65fac",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "esoko/soko-web",
|
"name": "esoko/soko-web",
|
||||||
"version": "0.6",
|
"version": "v0.7",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.esoko.eu/esoko/soko-web.git",
|
"url": "https://git.esoko.eu/esoko/soko-web.git",
|
||||||
"reference": "5e0579463cf0f4203c46e0d4f9c09cd283dbf0b8"
|
"reference": "88a2a99527b51dfb240ec78ac7070dc36a1022b6"
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"phpmailer/phpmailer": "^6.8",
|
"phpmailer/phpmailer": "^6.8",
|
||||||
@ -33,7 +33,7 @@
|
|||||||
"GNU GPL 3.0"
|
"GNU GPL 3.0"
|
||||||
],
|
],
|
||||||
"description": "Lightweight web framework",
|
"description": "Lightweight web framework",
|
||||||
"time": "2023-04-19T21:35:03+00:00"
|
"time": "2023-04-30T18:20:27+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "firebase/php-jwt",
|
"name": "firebase/php-jwt",
|
||||||
|
@ -48,7 +48,7 @@ class CommunityController implements IAuthenticationRequired
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
\Container::$persistentDataManager->loadRelationsFromDb($community, false);
|
\Container::$persistentDataManager->loadRelationsFromDb($community, false, ['main_currency']);
|
||||||
|
|
||||||
return new HtmlContent('communities/community', [
|
return new HtmlContent('communities/community', [
|
||||||
'community' => $community,
|
'community' => $community,
|
||||||
@ -326,7 +326,7 @@ class CommunityController implements IAuthenticationRequired
|
|||||||
|
|
||||||
private function getMembers(Community $community): array
|
private function getMembers(Community $community): array
|
||||||
{
|
{
|
||||||
$members = iterator_to_array($this->communityMemberRepository->getAllByCommunity($community, true, [User::class]));
|
$members = iterator_to_array($this->communityMemberRepository->getAllByCommunity($community, true, ['user']));
|
||||||
usort($members, function($a, $b) {
|
usort($members, function($a, $b) {
|
||||||
return strnatcmp($a->getUser()->getDisplayName(), $b->getUser()->getDisplayName());
|
return strnatcmp($a->getUser()->getDisplayName(), $b->getUser()->getDisplayName());
|
||||||
});
|
});
|
||||||
|
@ -28,7 +28,7 @@ class HomeController implements IAuthenticationRequired
|
|||||||
*/
|
*/
|
||||||
$user = \Container::$request->user();
|
$user = \Container::$request->user();
|
||||||
|
|
||||||
$ownCommunityMembers = $this->communityMemberRepository->getAllByUser($user, true, [Community::class]);
|
$ownCommunityMembers = $this->communityMemberRepository->getAllByUser($user, true, ['community']);
|
||||||
$communities = [];
|
$communities = [];
|
||||||
foreach ($ownCommunityMembers as $ownCommunityMember) {
|
foreach ($ownCommunityMembers as $ownCommunityMember) {
|
||||||
$communities[] = $ownCommunityMember->getCommunity();
|
$communities[] = $ownCommunityMember->getCommunity();
|
||||||
|
Loading…
Reference in New Issue
Block a user