rschneider/fitness-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change version to v.0.0.14 , add admin menu changes, add collection change

Browse Source
This commit is contained in:
Roland Schneider
2016-01-03 19:16:44 +01:00
parent 76ec26039f
commit dcb4e862b3
6 changed files with 59 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend/models/CollectionSearch.php
View File

@@ -8,6 +8,7 @@ use yii\data\ActiveDataProvider;
use common\models\Collection;
use common\components\Helper;
use common\components\RoleDefinition;
use common\models\Account;
/**
* CollectionSearch represents the model behind the search form about `common\models\Collection`.
@@ -56,11 +57,20 @@ class CollectionSearch extends Collection
public function search($params)
{
$query = Collection::find();
$query->innerJoinWith('account');
if ( !RoleDefinition::isAdmin() ){
$query->innerJoin("user_account_assignment",'collection.id_account = user_account_assignment.id_account' );
$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id ]);
$query->andWhere(['account.type' => Account::TYPE_ALL ]);
if ( RoleDefinition::isReception()){
$query->andWhere(['transfer.id_user' => Yii::$app->user->id ]);
}
}
$dataProvider = new ActiveDataProvider([