add role checking to controllers

This commit is contained in:
2015-11-05 17:24:09 +01:00
parent 43d5598f23
commit cc83ccf761
39 changed files with 362 additions and 78 deletions

View File

@@ -2,6 +2,7 @@
use yii\helpers\Html;
use yii\grid\GridView;
use common\components\RoleDefinition;
/* @var $this yii\web\View */
/* @var $searchModel backend\models\AccountSearch */
@@ -15,9 +16,11 @@ $this->params['breadcrumbs'][] = $this->title;
<h1><?= Html::encode($this->title) ?></h1>
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<?php if ( RoleDefinition::isAdmin()) {?>
<p>
<?= Html::a(Yii::t('common/account', 'Create Account'), ['create'], ['class' => 'btn btn-success']) ?>
</p>
<?php }?>
<?= GridView::widget([
'dataProvider' => $dataProvider,
@@ -35,7 +38,7 @@ $this->params['breadcrumbs'][] = $this->title;
'updated_at:datetime',
['class' => 'yii\grid\ActionColumn',
'template' => '{view} {update}'
'template' => RoleDefinition::getRoleTemplate( ['admin' => '{view} {update}','employee' => '{view}' , 'reception' => '{view}']),
],
],

View File

@@ -2,6 +2,7 @@
use yii\helpers\Html;
use yii\widgets\DetailView;
use common\components\RoleDefinition;
/* @var $this yii\web\View */
/* @var $model common\models\Account */
@@ -14,18 +15,11 @@ $this->params['breadcrumbs'][] = $this->title;
<h1><?= Html::encode($this->title) ?></h1>
<?php if ( RoleDefinition::isAdmin() ){?>
<p>
<?= Html::a(Yii::t('common/account', 'Update'), ['update', 'id' => $model->id_account], ['class' => 'btn btn-primary']) ?>
<?php
/*Html::a(Yii::t('common/account', 'Delete'), ['delete', 'id' => $model->id_account], [
'class' => 'btn btn-danger',
'data' => [
'confirm' => Yii::t('common/account', 'Are you sure you want to delete this item?'),
'method' => 'post',
],
]) */
?>
</p>
<?php }?>
<?= DetailView::widget([
'model' => $model,

View File

@@ -2,6 +2,7 @@
use yii\helpers\Html;
use yii\grid\GridView;
use common\components\RoleDefinition;
/* @var $this yii\web\View */
/* @var $searchModel backend\models\DiscountSearch */
@@ -15,9 +16,11 @@ $this->params['breadcrumbs'][] = $this->title;
<h1><?= Html::encode($this->title) ?></h1>
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<?php if ( RoleDefinition::isAdmin() ) {?>
<p>
<?= Html::a(Yii::t('common/discount', 'Create Discount'), ['create'], ['class' => 'btn btn-success']) ?>
</p>
<?php }?>
<?= GridView::widget([
'dataProvider' => $dataProvider,
@@ -37,7 +40,7 @@ $this->params['breadcrumbs'][] = $this->title;
[
'class' => 'yii\grid\ActionColumn',
'template' => '{view} {update}'
'template' => RoleDefinition::getRoleTemplate( ['admin' => '{view} {update}','employee' => '{view}' , 'reception' => '{view}']),
],
],
]); ?>

View File

@@ -2,6 +2,7 @@
use yii\helpers\Html;
use yii\widgets\DetailView;
use common\components\RoleDefinition;
/* @var $this yii\web\View */
/* @var $model common\models\Discount */
@@ -14,18 +15,11 @@ $this->params['breadcrumbs'][] = $this->title;
<h1><?= Html::encode($this->title) ?></h1>
<p>
<?= Html::a(Yii::t('common/discount', 'Update'), ['update', 'id' => $model->id_discount], ['class' => 'btn btn-primary']) ?>
<?php
/* Html::a(Yii::t('common/discount', 'Delete'), ['delete', 'id' => $model->id_discount], [
'class' => 'btn btn-danger',
'data' => [
'confirm' => Yii::t('common/discount', 'Are you sure you want to delete this item?'),
'method' => 'post',
],
])*/
?>
</p>
<?php if ( RoleDefinition::isAdmin()) {?>
<p>
<?= Html::a(Yii::t('common/discount', 'Update'), ['update', 'id' => $model->id_discount], ['class' => 'btn btn-primary']) ?>
</p>
<?php }?>
<?= DetailView::widget([
'model' => $model,

View File

@@ -10,6 +10,7 @@ use yii\bootstrap\NavBar;
use yii\widgets\Breadcrumbs;
use common\widgets\Alert;
use backend\components\AdminMenuStructure;
use kartik\widgets\AlertBlock;
AppAsset::register($this);
@@ -49,7 +50,14 @@ $items = $adminMenu->run();
<?= Breadcrumbs::widget([
'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
]) ?>
<?= Alert::widget() ?>
<?php //echo Alert::widget() ?>
<?php
echo AlertBlock::widget([
'useSessionFlash' => true,
'type' => AlertBlock::TYPE_GROWL,
'delay' => '1'
]);
?>
<?= $content ?>
</div>
</div>

View File

@@ -31,6 +31,7 @@ $warehouseOptions = ArrayHelper::map($warehouses, 'id_warehouse', 'name') ;
<div class="form-group">
<?= Html::submitButton($model->isNewRecord ? Yii::t('common/procurement', 'Create') : Yii::t('common/procurement', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
<?= Html::submitButton( Yii::t('common/procurement', 'Save/Next'), [ 'class' => 'btn btn-primary' ,'name' => '_next']) ?>
</div>
<?php ActiveForm::end(); ?>

View File

@@ -23,7 +23,7 @@ $statusOptions = mkOptions( Product::statuses() );
$productCategories = mkOptions( ArrayHelper::map( ProductCategory::read(null) ,'id_product_category','name') );
$accounts = mkOptions( ArrayHelper::map( Account::readAccounts(null) ,'id_account','name'));
$accounts = mkOptions( ArrayHelper::map( Account::read(null) ,'id_account','name'));
?>
<div class="product-search">

View File

@@ -2,6 +2,7 @@
use yii\helpers\Html;
use yii\grid\GridView;
use common\components\RoleDefinition;
/* @var $this yii\web\View */
/* @var $searchModel backend\models\TicketTypeSearch */
@@ -13,11 +14,12 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="ticket-type-index">
<h1><?= Html::encode($this->title) ?></h1>
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<?php if ( RoleDefinition::isAdmin()) {?>
<p>
<?= Html::a(Yii::t('common/ticket_type', 'Create Ticket Type'), ['create'], ['class' => 'btn btn-success']) ?>
</p>
<?php }?>
<?= GridView::widget([
'dataProvider' => $dataProvider,
@@ -51,7 +53,7 @@ $this->params['breadcrumbs'][] = $this->title;
[
'class' => 'yii\grid\ActionColumn',
'template' =>'{view} {update}'
'template' => RoleDefinition::getRoleTemplate( ['admin' => '{view} {update}','employee' => '{view}' , 'reception' => '{view}']),
],
],

View File

@@ -2,6 +2,7 @@
use yii\helpers\Html;
use yii\widgets\DetailView;
use common\components\RoleDefinition;
/* @var $this yii\web\View */
/* @var $model common\models\TicketType */
@@ -14,20 +15,11 @@ $this->params['breadcrumbs'][] = $this->title;
<h1><?= Html::encode($this->title) ?></h1>
<?php if ( RoleDefinition::isAdmin()) {?>
<p>
<?= Html::a(Yii::t('common/ticket_type', 'Update'), ['update', 'id' => $model->id_ticket_type], ['class' => 'btn btn-primary']) ?>
<?php
/*
echo Html::a(Yii::t('common/ticket_type', 'Delete'), ['delete', 'id' => $model->id_ticket_type], [
'class' => 'btn btn-danger',
'data' => [
'confirm' => Yii::t('common/ticket_type', 'Are you sure you want to delete this item?'),
'method' => 'post',
],
])
*/
?>
</p>
<?php }?>
<?= DetailView::widget([
'model' => $model,

View File

@@ -16,9 +16,12 @@ $this->params['breadcrumbs'][] = $this->title;
<h1><?= Html::encode($this->title) ?></h1>
<?php echo $this->render('_search', ['model' => $searchModel]); ?>
<?php if ( RoleDefinition::isAdmin()){ ?>
<p>
<?= Html::a(Yii::t('app', 'Új felhasználó'), ['create'], ['class' => 'btn btn-success']) ?>
</p>
<?php } ?>
<?= GridView::widget([
'dataProvider' => $dataProvider,
@@ -39,7 +42,7 @@ $this->params['breadcrumbs'][] = $this->title;
] ,
['class' => 'yii\grid\ActionColumn',
'template' => '{view} {update}'
'template' => RoleDefinition::getRoleTemplate([ 'admin' => '{view} {update}', 'employee' => '{view}' ] )
],
],
]); ?>

View File

@@ -5,12 +5,10 @@ use yii\helpers\Html;
/* @var $this yii\web\View */
/* @var $model common\models\User */
$this->title = Yii::t('app', 'Update {modelClass}: ', [
'modelClass' => 'User',
]) . ' ' . $model->id;
$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Users'), 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' => $model->id]];
$this->params['breadcrumbs'][] = Yii::t('app', 'Update');
$this->title = Yii::t('backend/user', 'Edit user' );
$this->params['breadcrumbs'][] = ['label' => Yii::t('backend/user', 'Users'), 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->username, 'url' => ['view', 'id' => $model->id]];
$this->params['breadcrumbs'][] = Yii::t('backend/user', 'Update');
?>
<div class="user-update">

View File

@@ -2,21 +2,24 @@
use yii\helpers\Html;
use yii\widgets\DetailView;
use common\components\RoleDefinition;
/* @var $this yii\web\View */
/* @var $model common\models\User */
$this->title = $model->id;
$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Felhasználók'), 'url' => ['index']];
$this->title = $model->username;
$this->params['breadcrumbs'][] = ['label' => Yii::t('backend/user', 'Users'), 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="user-view">
<h1><?= Html::encode($this->title) ?></h1>
<?php if ( RoleDefinition::isAdmin()) {?>
<p>
<?= Html::a(Yii::t('app', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
<?= Html::a(Yii::t('backend/user', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
</p>
<?php }?>
<?= DetailView::widget([
'model' => $model,