diff --git a/frontend/controllers/CompanyController.php b/frontend/controllers/CompanyController.php index 9d71d5b..f09a100 100755 --- a/frontend/controllers/CompanyController.php +++ b/frontend/controllers/CompanyController.php @@ -161,33 +161,27 @@ public function actionTeam($company_id) { $company = User::findOne($company_id); - if(!$company instanceof User) { throw new BadRequestHttpException('Пользователь не найден'); } - + $comments = new ActiveDataProvider([ + 'query' => $company->getComments(), + 'pagination' => [ + 'pageSize' => 4 + ], + ]); $query = Team::find() ->where([ 'user_id' => $company_id ]); - - $countQuery = clone $query; - - $pagination = new Pagination([ - 'totalCount' => $countQuery->count(), - 'pageSize' => 9, - ]); - - $team = $query->offset($pagination->offset) - ->limit($pagination->limit) - ->all(); - - $team = new ArrayDataProvider([ - 'allModels' => $team, + $team = new ActiveDataProvider([ + 'query' => $query, + 'pagination' => [ + 'pageSize' => 9, + ], ]); - return $this->render('team', [ - 'company' => $company, - 'team' => $team, - 'pagination' => $pagination, + 'company' => $company, + 'team' => $team, + 'comments' => $comments, ]); } @@ -269,19 +263,11 @@ $query = $company->getVacancies(); - $countQuery = clone $query; - - $pagination = new Pagination([ - 'totalCount' => $countQuery->count(), - 'pageSize' => 5, - ]); - - $vacancy = $query->offset($pagination->offset) - ->limit($pagination->limit); - $provider = new ActiveDataProvider([ - 'query' => $vacancy, - 'pagination' => false, + 'query' => $query, + 'pagination' => [ + 'pageSize' => 5, + ], 'sort' => [ 'defaultOrder' => [ 'date_add' => SORT_DESC, @@ -291,9 +277,8 @@ ]); return $this->render('vacancy-list', [ - 'company' => $company, - 'provider' => $provider, - 'pagination' => $pagination, + 'company' => $company, + 'provider' => $provider, ]); } diff --git a/frontend/views/company/_company_list_view.php b/frontend/views/company/_company_list_view.php index 5d9d807..7a27d65 100644 --- a/frontend/views/company/_company_list_view.php +++ b/frontend/views/company/_company_list_view.php @@ -6,7 +6,13 @@