chenx221/yii2-netdisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

强化文件收集任务的搜素模型，以支持管理员端文件收集管理功能

Browse Source 
*暂未检查最新改动是否会破坏用户端预期行为
This commit is contained in:
Chenx221 2024-04-08 16:18:31 +08:00
parent a465574e59
commit c22f6a820a
Signed by: chenx221
GPG Key ID: D7A9EC07024C3021
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
models/CollectionSearch.php
View File

@ -14,10 +14,10 @@ class CollectionSearch extends CollectionTasks
/**
* {@inheritdoc}
*/
public function rules()
public function rules(): array
{
return [
[['id', 'user_id'], 'integer'],
[['id', 'user_id','status'], 'integer'],
[['folder_path', 'created_at', 'secret'], 'safe'],
];
}
@ -25,7 +25,7 @@ class CollectionSearch extends CollectionTasks
/**
* {@inheritdoc}
*/
public function scenarios()
public function scenarios(): array
{
// bypass scenarios() implementation in the parent class
return Model::scenarios();
@ -38,9 +38,14 @@ class CollectionSearch extends CollectionTasks
*
* @return ActiveDataProvider
*/
public function search($params)
public function search($params): ActiveDataProvider
{
$query = CollectionTasks::find()->where(['user_id' => Yii::$app->user->id]);
// if user is admin
if (Yii::$app->user->can('admin')) {
$query = CollectionTasks::find();
} else {
$query = CollectionTasks::find()->where(['user_id' => Yii::$app->user->id]);
}
// add conditions that should always apply here
@ -57,11 +62,20 @@ class CollectionSearch extends CollectionTasks
}
// grid filtering conditions
$query->andFilterWhere([
'id' => $this->id,
// 'user_id' => $this->user_id,
'created_at' => $this->created_at,
]);
if (Yii::$app->user->can('admin')) {
$query->andFilterWhere([
'id' => $this->id,
'user_id' => $this->user_id,
'created_at' => $this->created_at,
'status'=>$this->status,
]);
}else{
$query->andFilterWhere([
'id' => $this->id,
'created_at' => $this->created_at,
'status'=>$this->status,
]);
}
$query->andFilterWhere(['like', 'folder_path', $this->folder_path])
->andFilterWhere(['like', 'secret', $this->secret]);