mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-16 21:58:17 +01:00
Code Issues Projects Releases Wiki Activity

Fix #3975: Space chooser directory button visible, even if user is not allowed to access directory

Browse Source
This commit is contained in:
buddh4 2020-05-14 19:19:45 +02:00
parent 111f144a6f
commit 3fa901d19d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
protected/humhub/docs/CHANGELOG.md
View File

@ -23,6 +23,7 @@ HumHub Change Log
- Fix #4034: Premission filter pagination shown without reason and broken
- Fix #4012: Permission filter dropdown shows module id instead of module name
- Fix #4046: Search results not highlighted
- Fix #3975: Space chooser directory button visible, even if user is not allowed to access directory
1.5.1 (April 19, 2020)
----------------------

7
protected/humhub/modules/space/widgets/views/spaceChooser.php
View File

@ -1,6 +1,7 @@
<?php
use humhub\components\View;
use humhub\modules\directory\permissions\AccessDirectory;
use humhub\modules\space\assets\SpaceChooserAsset;
use humhub\modules\space\models\Membership;
use humhub\modules\space\models\Space;
@ -31,7 +32,7 @@ $this->registerJsConfig('space.chooser', [
/* @var $directoryModule \humhub\modules\directory\Module */
$directoryModule = Yii::$app->getModule('directory');
$isDirectoryActive = $directoryModule->active;
$canAccessDirectory = $directoryModule->active && Yii::$app->user->can(AccessDirectory::class);
?>
@ -59,11 +60,11 @@ $isDirectoryActive = $directoryModule->active;
<ul class="dropdown-menu" id="space-menu-dropdown">
<li>
<form action="" class="dropdown-controls">
<div <?php if($isDirectoryActive) : ?>class="input-group"<?php endif; ?>>
<div <?php if($canAccessDirectory) : ?>class="input-group"<?php endif; ?>>
<input type="text" id="space-menu-search" class="form-control" autocomplete="off"
placeholder="<?= Yii::t('SpaceModule.chooser', 'Search'); ?>"
title="<?= Yii::t('SpaceModule.chooser', 'Search for spaces'); ?>">
<?php if($isDirectoryActive) : ?>
<?php if($canAccessDirectory) : ?>
<span id="space-directory-link" class="input-group-addon" >
<a href="<?= Url::to(['/directory/directory/spaces']); ?>">
<i class="fa fa-book"></i>