mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-03-14 20:19:47 +01:00
Code Issues Projects Releases Wiki Activity

Fix links of user counters in container headers (#5672)

Browse Source
This commit is contained in:
Yuriy Bakhtin 2022-04-27 12:48:39 +03:00 committed by GitHub
parent 123c8af3ac
commit 2eccd0422d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -4,7 +4,8 @@ HumHub Changelog
1.11.2 (Unreleased)
-------------------
- Fix #5660: Invidiual modules marked with "Official" label in Marketplace
- Fix #5660: Individual modules marked with "Official" label in Marketplace
- Fix #5657: Fix links of user counters in container headers
1.11.1 (April 22, 2022)

13
protected/humhub/modules/space/widgets/HeaderCounterSet.php
View File

@ -45,22 +45,21 @@ class HeaderCounterSet extends CounterSet
$this->counters[] = new CounterSetItem([
'label' => Yii::t('SpaceModule.base', 'Members'),
'value' => Membership::getSpaceMembersQuery($this->space)->active()->visible()->count(),
'url' => '#',
'linkOptions' => [
'url' => Yii::$app->user->isGuest ? null : '#',
'linkOptions' => Yii::$app->user->isGuest ? [] : [
'data-action-click' => 'ui.modal.load',
'data-action-url' => (Yii::$app->user->isGuest) ? null : Url::to(['/space/membership/members-list', 'container' => $this->space])
'data-action-url' => Url::to(['/space/membership/members-list', 'container' => $this->space])
]
]);
if (!Yii::$app->getModule('space')->disableFollow) {
$this->counters[] = new CounterSetItem([
'label' => Yii::t('SpaceModule.base', 'Followers'),
'value' => $this->space->getFollowersQuery()->count(),
'url' => '#',
'linkOptions' => [
'url' => Yii::$app->user->isGuest ? null : '#',
'linkOptions' => Yii::$app->user->isGuest ? [] : [
'data-action-click' => 'ui.modal.load',
'data-action-url' => (Yii::$app->user->isGuest) ? null : Url::to(['/space/space/follower-list', 'container' => $this->space])
'data-action-url' => Url::to(['/space/space/follower-list', 'container' => $this->space])
]
]);
}

24
protected/humhub/modules/user/widgets/ProfileHeaderCounterSet.php
View File

@ -40,10 +40,10 @@ class ProfileHeaderCounterSet extends CounterSet
$this->counters[] = new CounterSetItem([
'label' => Yii::t('UserModule.profile', 'Friends'),
'value' => Friendship::getFriendsQuery($this->user)->count(),
'url' => '#',
'linkOptions' => [
'url' => Yii::$app->user->isGuest ? null : '#',
'linkOptions' => Yii::$app->user->isGuest ? [] : [
'data-action-click' => 'ui.modal.load',
'data-action-url' => (Yii::$app->user->isGuest) ? null : Url::to(['/friendship/list/popup', 'userId' => $this->user->id])
'data-action-url' => Url::to(['/friendship/list/popup', 'userId' => $this->user->id])
]
]);
}
@ -52,20 +52,20 @@ class ProfileHeaderCounterSet extends CounterSet
$this->counters[] = new CounterSetItem([
'label' => Yii::t('UserModule.profile', 'Followers'),
'value' => $this->user->getFollowersQuery()->count(),
'url' => '#',
'linkOptions' => [
'url' => Yii::$app->user->isGuest ? null : '#',
'linkOptions' => Yii::$app->user->isGuest ? [] : [
'data-action-click' => 'ui.modal.load',
'data-action-url' => (Yii::$app->user->isGuest) ? null : Url::to(['/user/profile/follower-list', 'container' => $this->user])
'data-action-url' => Url::to(['/user/profile/follower-list', 'container' => $this->user])
]
]);
$this->counters[] = new CounterSetItem([
'label' => Yii::t('UserModule.profile', 'Following'),
'value' => $this->user->getFollowingQuery(User::find())->count(),
'url' => '#',
'linkOptions' => [
'url' => Yii::$app->user->isGuest ? null : '#',
'linkOptions' => Yii::$app->user->isGuest ? [] : [
'data-action-click' => 'ui.modal.load',
'data-action-url' => (Yii::$app->user->isGuest) ? null : Url::to(['/user/profile/followed-users-list', 'container' => $this->user])
'data-action-url' => Url::to(['/user/profile/followed-users-list', 'container' => $this->user])
]
]);
}
@ -78,10 +78,10 @@ class ProfileHeaderCounterSet extends CounterSet
$this->counters[] = new CounterSetItem([
'label' => Yii::t('UserModule.profile', 'Spaces'),
'value' => $spaceMembershipCount,
'url' => '#',
'linkOptions' => [
'url' => Yii::$app->user->isGuest ? null : '#',
'linkOptions' => Yii::$app->user->isGuest ? [] : [
'data-action-click' => 'ui.modal.load',
'data-action-url' => (Yii::$app->user->isGuest) ? null : Url::to(['/user/profile/space-membership-list', 'container' => $this->user])
'data-action-url' => Url::to(['/user/profile/space-membership-list', 'container' => $this->user])
]
]);