leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fix-string1

Browse Source 
# Conflicts:
#	src/User/resources/i18n/pt-PT/usuario.php
This commit is contained in:
Tõnis Ormisson
2018-09-12 12:10:46 +03:00
parent 52e8c1db7d 75b9cd87d5
commit e437219ecc
17 changed files with 274 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/User/resources/views/permission/index.php
View File

@ -53,7 +53,7 @@ $this->params['breadcrumbs'][] = $this->title;
],
],
[
'class' => ActionColumn::className(),
'class' => ActionColumn::class,
'template' => '{update} {delete}',
'urlCreator' => function ($action, $model) {
return Url::to(['/user/permission/' . $action, 'name' => $model['name']]);

2
src/User/resources/views/role/index.php
View File

@ -54,7 +54,7 @@ $this->params['breadcrumbs'][] = $this->title;
],
],
[
'class' => ActionColumn::className(),
'class' => ActionColumn::class,
'template' => '{update} {delete}',
'urlCreator' => function ($action, $model) {
return Url::to(['/user/role/' . $action, 'name' => $model['name']]);

2
src/User/resources/views/rule/index.php
View File

@ -60,7 +60,7 @@ $this->params['breadcrumbs'][] = $this->title;
],
],
[
'class' => ActionColumn::className(),
'class' => ActionColumn::class,
'template' => '{update} {delete}',
'urlCreator' => function ($action, $model) {
return Url::to(['/user/rule/' . $action, 'name' => $model['name']]);

2
src/User/resources/views/settings/privacy.php
View File

@ -52,7 +52,7 @@ $this->title = Yii::t('usuario', 'Privacy settings');
'data-confirm' => Yii::t('usuario', 'Are you sure? There is no going back'),
]
) ?>
<? else:
<?php else:
echo Html::a(Yii::t('usuario', 'Delete'),
['/user/settings/gdprdelete'],
[