diff --git a/common/models/UserInfo.php b/common/models/UserInfo.php index 7b14f76..15d8b3f 100755 --- a/common/models/UserInfo.php +++ b/common/models/UserInfo.php @@ -125,11 +125,6 @@ 'min' => 1950, ], [ - [ 'experience' ], - 'default', - 'value' => date('Y'), - ], - [ [ 'rank', 'location', diff --git a/frontend/config/main.php b/frontend/config/main.php index 8cc0dbe..6b90a1e 100755 --- a/frontend/config/main.php +++ b/frontend/config/main.php @@ -75,18 +75,26 @@ return [ 'showScriptName' => false, 'rules' => [ 'landing/' => 'landing/view', + 'performer/portfolio///' => 'performer/portfolio-filter', 'performer/portfolio//' => 'performer/portfolio-filter', + 'performer/portfolio-view///' => 'performer/portfolio-view', 'performer/portfolio-view//' => 'performer/portfolio-view', + 'performer/blog-view///' => 'performer/blog-view', 'performer/blog-view//' => 'performer/blog-view', + 'performer///' => 'performer/', 'performer//' => 'performer/', + 'company/portfolio///' => 'company/portfolio-filter', 'company/portfolio//' => 'company/portfolio-filter', + 'company/portfolio-view///' => 'company/portfolio-view', 'company/portfolio-view//' => 'company/portfolio-view', + 'company/blog-view///' => 'company/blog-view', 'company/blog-view//' => 'company/blog-view', + 'company/vacancy-view///' => 'company/vacancy-view', 'company/vacancy-view//' => 'company/vacancy-view', + 'company//' => 'company/', 'company//' => 'company/', 'chat/message/'=> 'chat/message', 'tender/view/' => 'tender/view', - ] ], ], diff --git a/frontend/controllers/CompanyController.php b/frontend/controllers/CompanyController.php index 00253a0..f75c787 100755 --- a/frontend/controllers/CompanyController.php +++ b/frontend/controllers/CompanyController.php @@ -46,12 +46,7 @@ ]; } - public function actionIndex() - { - $this->redirect('site/index'); - } - - public function actionCommon($company_id) + public function actionCommon($company_id, $type = 'implementer') { /** * @var User $company @@ -109,7 +104,7 @@ ]); } - public function actionPortfolio($company_id) + public function actionPortfolio($company_id, $type = 'implementer') { $company = User::findOne($company_id); @@ -144,7 +139,7 @@ ]); } - public function actionPortfolioFilter($performer_id, $filter) + public function actionPortfolioFilter($performer_id, $filter, $type = 'implementer') { $company = User::findOne($performer_id); @@ -187,7 +182,7 @@ ]); } - public function actionPortfolioView($company_id, $portfolio_id) + public function actionPortfolioView($company_id, $portfolio_id, $type = 'implementer') { $user = User::findOne($company_id); $portfolio = $user->getPortfolios() @@ -200,7 +195,7 @@ ]); } - public function actionTeam($company_id) + public function actionTeam($company_id, $type = 'implementer') { $company = User::findOne($company_id); if(!$company instanceof User) { @@ -227,7 +222,7 @@ ]); } - public function actionBlogList($company_id) + public function actionBlogList($company_id, $type = 'implementer') { $company = User::findOne($company_id); @@ -261,7 +256,7 @@ ]); } - public function actionBlogView($company_id, $link) + public function actionBlogView($company_id, $link, $type = 'implementer') { $company = User::findOne($company_id); @@ -285,7 +280,7 @@ ]); } - public function actionReview($company_id) + public function actionReview($company_id, $type = 'implementer') { $company = User::findOne($company_id); @@ -294,7 +289,7 @@ ]); } - public function actionVacancyList($company_id) + public function actionVacancyList($company_id, $type = 'implementer') { $company = User::findOne($company_id); @@ -325,7 +320,7 @@ } - public function actionVacancyView($company_id, $link) + public function actionVacancyView($company_id, $link, $type = 'implementer') { $company = User::findOne($company_id); $vacancy = $company->getVacancies() @@ -366,7 +361,7 @@ ]); } - public function actionGallery($company_id) + public function actionGallery($company_id, $type = 'implementer') { $company = User::findOne($company_id); diff --git a/frontend/controllers/PerformerController.php b/frontend/controllers/PerformerController.php index e144761..a570057 100755 --- a/frontend/controllers/PerformerController.php +++ b/frontend/controllers/PerformerController.php @@ -55,9 +55,8 @@ ]; } - public function actionCommon($performer_id) + public function actionCommon($performer_id, $type = 'implementer') { - $user = User::find() ->where([ 'id' => $performer_id ]) ->with('jobs') @@ -88,7 +87,7 @@ } - public function actionPortfolio($performer_id) + public function actionPortfolio($performer_id, $type = 'implementer') { $user = User::findOne($performer_id); @@ -124,7 +123,7 @@ } - public function actionPortfolioFilter($performer_id, $filter) + public function actionPortfolioFilter($performer_id, $filter, $type = 'implementer') { $user = User::findOne($performer_id); @@ -167,7 +166,7 @@ ]); } - public function actionPortfolioView($performer_id, $portfolio_id) + public function actionPortfolioView($performer_id, $portfolio_id, $type = 'implementer') { $user = User::findOne($performer_id); $portfolio = $user->getPortfolios() @@ -180,7 +179,7 @@ ]); } - public function actionProjects($performer_id) + public function actionProjects($performer_id, $type = 'implementer') { $user = User::findOne($performer_id); @@ -201,7 +200,7 @@ ]); } - public function actionBlogList($performer_id) + public function actionBlogList($performer_id, $type = 'implementer') { $user = User::findOne($performer_id); @@ -234,7 +233,7 @@ ]); } - public function actionBlogView($performer_id, $link) + public function actionBlogView($performer_id, $link, $type = 'implementer') { $user = User::findOne($performer_id); @@ -257,7 +256,7 @@ ]); } - public function actionReview($performer_id) + public function actionReview($performer_id, $type = 'implementer') { $user = User::findOne($performer_id); @@ -270,7 +269,7 @@ ]); } - public function actionWorkplace($performer_id) + public function actionWorkplace($performer_id, $type = 'implementer') { $user = User::find() ->where([ 'id' => $performer_id ]) @@ -285,7 +284,7 @@ ]); } - public function actionGallery($performer_id) + public function actionGallery($performer_id, $type = 'implementer') { $user = User::findOne($performer_id); @@ -322,4 +321,12 @@ 'videos' => $videos, ]); } + + public function beforeAction($action) + { + if(!empty(\Yii::$app->request->get('type'))) { + $action->controller->view->params['type'] = \Yii::$app->request->get('type'); + } + return parent::beforeAction($action); + } } diff --git a/frontend/views/layouts/performer.php b/frontend/views/layouts/performer.php index 73bd7b2..6ae0940 100755 --- a/frontend/views/layouts/performer.php +++ b/frontend/views/layouts/performer.php @@ -13,7 +13,6 @@ \frontend\assets\AppAsset::register($this); $this->beginContent('@app/views/layouts/main.php'); - ?>
@@ -62,6 +61,7 @@ 'url' => [ 'performer/common', 'performer_id' => $this->params[ 'user' ]->id, + 'type' => (!empty($this->params['type']))?$this->params['type']:null, ], ], [ @@ -69,6 +69,7 @@ 'url' => [ 'performer/portfolio', 'performer_id' => $this->params[ 'user' ]->id, + 'type' => (!empty($this->params['type']))?$this->params['type']:null, ], ], [ @@ -76,6 +77,7 @@ 'url' => [ 'performer/projects', 'performer_id' => $this->params[ 'user' ]->id, + 'type' => (!empty($this->params['type']))?$this->params['type']:null, ], ], [ @@ -83,6 +85,7 @@ 'url' => [ 'performer/blog-list', 'performer_id' => $this->params[ 'user' ]->id, + 'type' => (!empty($this->params['type']))?$this->params['type']:null, ], ], [ @@ -90,6 +93,7 @@ 'url' => [ 'performer/review', 'performer_id' => $this->params[ 'user' ]->id, + 'type' => (!empty($this->params['type']))?$this->params['type']:null, ], ], [ @@ -97,6 +101,7 @@ 'url' => [ 'performer/workplace', 'performer_id' => $this->params[ 'user' ]->id, + 'type' => (!empty($this->params['type']))?$this->params['type']:null, ], ], [ @@ -104,6 +109,7 @@ 'url' => [ 'performer/gallery', 'performer_id' => $this->params[ 'user' ]->id, + 'type' => (!empty($this->params['type']))?$this->params['type']:null, ], ], ], @@ -145,6 +151,7 @@ $this->params[ 'user' ]->id, + 'type' => (!empty($this->params['type']))?$this->params['type']:null, ], [ 'class' => 'performance-vacancy-sidebar-write style' ]) ?>
-- libgit2 0.21.4