Merge pull request #3154 from acs-ferreira/patch-13

Show 'never' instead of fake date
This commit is contained in:
Lucas Bartholemy 2018-06-04 00:30:34 +02:00 committed by GitHub
commit c104dd0fa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,14 +1,14 @@
<?php
use yii\helpers\Html;
use humhub\widgets\GridView;
use humhub\widgets\TimeAgo;
use humhub\modules\space\modules\manage\widgets\MemberMenu;
?>
<div class="panel panel-default">
<div class="panel-heading">
<?php echo Yii::t('SpaceModule.views_admin_members', '<strong>Manage</strong> members'); ?>
<?= Yii::t('SpaceModule.views_admin_members', '<strong>Manage</strong> members'); ?>
</div>
<?= MemberMenu::widget(['space' => $space]); ?>
<div class="panel-body">
@ -16,7 +16,6 @@ use humhub\modules\space\modules\manage\widgets\MemberMenu;
<?php
$groups = $space->getUserGroups();
echo GridView::widget([
'dataProvider' => $dataProvider,
'filterModel' => $searchModel,
@ -27,29 +26,31 @@ use humhub\modules\space\modules\manage\widgets\MemberMenu;
[
'attribute' => 'last_visit',
'format' => 'raw',
'value' =>
function($data) use(&$groups) {
return humhub\widgets\TimeAgo::widget(['timestamp' => $data->last_visit]);
'value' => function ($data) use (&$groups) {
if (empty($data->last_visit)) {
return Yii::t('SpaceModule.views_admin_members', 'never');
}
return TimeAgo::widget(['timestamp' => $data->last_visit]);
}
],
[
'header' => Yii::t('SpaceModule.views_admin_members', 'Actions'),
'class' => 'yii\grid\ActionColumn',
'buttons' => [
'view' => function() {
return;
},
'delete' => function($url, $model) use($space) {
return Html::a('Cancel', $space->createUrl('remove', ['userGuid' => $model->user->guid]), ['class' => 'btn btn-danger btn-sm', 'data-confirm' => 'Are you sure?', 'data-method' => 'POST']);
},
'update' => function() {
return;
},
],
],
],
]);
?>
],
[
'header' => Yii::t('SpaceModule.views_admin_members', 'Actions'),
'class' => 'yii\grid\ActionColumn',
'buttons' => [
'view' => function() {
return;
},
'delete' => function($url, $model) use($space) {
return Html::a('Cancel', $space->createUrl('remove', ['userGuid' => $model->user->guid]), ['class' => 'btn btn-danger btn-sm', 'data-confirm' => 'Are you sure?', 'data-method' => 'POST']);
},
'update' => function() {
return;
},
],
],
],
]);
?>
</div>
</div>
</div>