mirror of
https://github.com/humhub/humhub.git
synced 2025-01-17 14:18:27 +01:00
Fix: Added missing admin group title encodings
This commit is contained in:
parent
faeebae53a
commit
de4269968b
@ -6,6 +6,7 @@ HumHub Change Log
|
|||||||
---------------------------
|
---------------------------
|
||||||
- Fix: LinkedIn API call to v1 deprecated use v2 (@Felli)
|
- Fix: LinkedIn API call to v1 deprecated use v2 (@Felli)
|
||||||
- Fix #3531: File module Fil: isAssignedTo method broken
|
- Fix #3531: File module Fil: isAssignedTo method broken
|
||||||
|
- Fix: Added missing admin group title encodings
|
||||||
|
|
||||||
|
|
||||||
1.3.13 (May 3, 2019)
|
1.3.13 (May 3, 2019)
|
||||||
|
@ -12,6 +12,7 @@ use humhub\modules\admin\models\forms\AuthenticationSettingsForm;
|
|||||||
use humhub\modules\admin\permissions\ManageSettings;
|
use humhub\modules\admin\permissions\ManageSettings;
|
||||||
use humhub\modules\user\models\Group;
|
use humhub\modules\user\models\Group;
|
||||||
use Yii;
|
use Yii;
|
||||||
|
use yii\helpers\Html;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ApprovalController handels new user approvals
|
* ApprovalController handels new user approvals
|
||||||
@ -71,7 +72,7 @@ class AuthenticationController extends Controller
|
|||||||
|
|
||||||
foreach (Group::find()->all() as $group) {
|
foreach (Group::find()->all() as $group) {
|
||||||
if (!$group->is_admin_group) {
|
if (!$group->is_admin_group) {
|
||||||
$groups[$group->id] = $group->name;
|
$groups[$group->id] = Html::encode($group->name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace humhub\modules\admin\models\forms;
|
namespace humhub\modules\admin\models\forms;
|
||||||
|
|
||||||
|
use humhub\libs\Html;
|
||||||
use humhub\modules\user\models\GroupUser;
|
use humhub\modules\user\models\GroupUser;
|
||||||
use Yii;
|
use Yii;
|
||||||
use humhub\modules\user\models\User;
|
use humhub\modules\user\models\User;
|
||||||
@ -147,7 +148,7 @@ class UserEditForm extends User
|
|||||||
|
|
||||||
$result = [];
|
$result = [];
|
||||||
foreach ($groups as $group) {
|
foreach ($groups as $group) {
|
||||||
$result[$group->id] = $group->name;
|
$result[$group->id] = Html::encode($group->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
|
|
||||||
namespace humhub\modules\admin\models\forms;
|
namespace humhub\modules\admin\models\forms;
|
||||||
|
|
||||||
|
use humhub\libs\Html;
|
||||||
use yii\base\Model;
|
use yii\base\Model;
|
||||||
use humhub\modules\user\models\Group;
|
use humhub\modules\user\models\Group;
|
||||||
|
|
||||||
@ -137,7 +138,7 @@ class UserGroupForm extends Model
|
|||||||
{
|
{
|
||||||
$result = [];
|
$result = [];
|
||||||
foreach ($groups as $group) {
|
foreach ($groups as $group) {
|
||||||
$result[$group->id] = $group->name;
|
$result[$group->id] = Html::encode($group->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
|
@ -8,7 +8,7 @@ use humhub\libs\Html;
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<?php if (!$group->isNewRecord) : ?>
|
<?php if (!$group->isNewRecord) : ?>
|
||||||
<h4><?= Yii::t('AdminModule.user', 'Manage group: {groupName}', ['groupName' => $group->name]); ?></h4>
|
<h4><?= Yii::t('AdminModule.user', 'Manage group: {groupName}', ['groupName' => Html::encode($group->name)]); ?></h4>
|
||||||
<?php else: ?>
|
<?php else: ?>
|
||||||
<h4><?= Yii::t('AdminModule.user', 'Add new group'); ?></h4>
|
<h4><?= Yii::t('AdminModule.user', 'Add new group'); ?></h4>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
@ -9,19 +9,20 @@ humhub\modules\directory\assets\DirectoryAsset::register($this);
|
|||||||
<div class="panel panel-default" id="groups-statistics-panel">
|
<div class="panel panel-default" id="groups-statistics-panel">
|
||||||
|
|
||||||
<!-- Display panel menu widget -->
|
<!-- Display panel menu widget -->
|
||||||
<?php echo humhub\widgets\PanelMenu::widget(['id' => 'groups-statistics-panel']); ?>
|
<?= humhub\widgets\PanelMenu::widget(['id' => 'groups-statistics-panel']); ?>
|
||||||
|
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<?php echo Yii::t('DirectoryModule.base', '<strong>Group</strong> stats'); ?>
|
<?= Yii::t('DirectoryModule.base', '<strong>Group</strong> stats'); ?>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<div class="knob-container" style="text-align: center; opacity: 0;">
|
<div class="knob-container" style="text-align: center; opacity: 0;">
|
||||||
<strong><?php echo Yii::t('DirectoryModule.base', 'Total groups'); ?></strong><br><br>
|
<strong><?= Yii::t('DirectoryModule.base', 'Total groups'); ?></strong><br><br>
|
||||||
|
|
||||||
<input id="groups-total" class="knob" data-width="120" data-height="140" data-displayPrevious="true" data-readOnly="true"
|
<input id="groups-total" class="knob" data-width="120" data-height="140" data-displayPrevious="true"
|
||||||
|
data-readOnly="true"
|
||||||
data-fgcolor="<?= $this->theme->variable('primary'); ?>" data-skin="tron"
|
data-fgcolor="<?= $this->theme->variable('primary'); ?>" data-skin="tron"
|
||||||
data-thickness=".2" value="<?php echo $statsTotalGroups; ?>"
|
data-thickness=".2" value="<?= $statsTotalGroups; ?>"
|
||||||
data-max="<?php echo $statsTotalGroups; ?>"
|
data-max="<?= $statsTotalGroups; ?>"
|
||||||
style="font-size: 25px !important; margin-top: 44px !important;">
|
style="font-size: 25px !important; margin-top: 44px !important;">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -30,17 +31,19 @@ humhub\modules\directory\assets\DirectoryAsset::register($this);
|
|||||||
<div class="knob-container" style="text-align: center; opacity: 0;">
|
<div class="knob-container" style="text-align: center; opacity: 0;">
|
||||||
<strong><?php echo Yii::t('DirectoryModule.base', 'Average members'); ?></strong><br><br>
|
<strong><?php echo Yii::t('DirectoryModule.base', 'Average members'); ?></strong><br><br>
|
||||||
|
|
||||||
<input id="group-average" class="knob" data-width="120" data-height="140" data-displayPrevious="true" data-readOnly="true"
|
<input id="group-average" class="knob" data-width="120" data-height="140" data-displayPrevious="true"
|
||||||
|
data-readOnly="true"
|
||||||
data-fgcolor="<?= $this->theme->variable('primary'); ?>"
|
data-fgcolor="<?= $this->theme->variable('primary'); ?>"
|
||||||
data-skin="tron"
|
data-skin="tron"
|
||||||
data-thickness=".2" value="<?php echo $statsAvgMembers; ?>"
|
data-thickness=".2" value="<?= $statsAvgMembers; ?>"
|
||||||
data-max="<?php echo $statsTotalUsers; ?>"
|
data-max="<?= $statsTotalUsers; ?>"
|
||||||
style="font-size: 25px !important; margin-top: 44px !important;">
|
style="font-size: 25px !important; margin-top: 44px !important;">
|
||||||
</div>
|
</div>
|
||||||
<hr>
|
<hr>
|
||||||
|
|
||||||
<div style="text-align: center;">
|
<div style="text-align: center;">
|
||||||
<strong><?php echo Yii::t('DirectoryModule.base', 'Top Group'); ?>:</strong> <?php echo Html::encode($statsTopGroup->name); ?>
|
<strong><?= Yii::t('DirectoryModule.base', 'Top Group'); ?>
|
||||||
|
:</strong> <?= Html::encode($statsTopGroup->name); ?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
Loading…
x
Reference in New Issue
Block a user