Commit 5014e10bed98e2404d46619aa4312728727d4628
1 parent
788e40d8
test
Showing
5 changed files
with
46 additions
and
34 deletions
Show diff stats
common/models/UserInfo.php
frontend/config/main.php
| ... | ... | @@ -75,18 +75,26 @@ return [ |
| 75 | 75 | 'showScriptName' => false, |
| 76 | 76 | 'rules' => [ |
| 77 | 77 | 'landing/<view:[\w-]+>' => 'landing/view', |
| 78 | + 'performer/portfolio/<performer_id:[\w-]+>/<type:(?:implementer|customer)>/<filter:[\d]+>' => 'performer/portfolio-filter', | |
| 78 | 79 | 'performer/portfolio/<performer_id:[\w-]+>/<filter:[\d]+>' => 'performer/portfolio-filter', |
| 80 | + 'performer/portfolio-view/<performer_id:[\w-]+>/<type:(?:implementer|customer)>/<portfolio_id:[\w-]+>' => 'performer/portfolio-view', | |
| 79 | 81 | 'performer/portfolio-view/<performer_id:[\w-]+>/<portfolio_id:[\w-]+>' => 'performer/portfolio-view', |
| 82 | + 'performer/blog-view/<performer_id:[\w-]+>/<type:(?:implementer|customer)>/<link:[\w-]+>' => 'performer/blog-view', | |
| 80 | 83 | 'performer/blog-view/<performer_id:[\w-]+>/<link:[\w-]+>' => 'performer/blog-view', |
| 84 | + 'performer/<action>/<performer_id:[\w-]+>/<type:(?:implementer|customer)>' => 'performer/<action>', | |
| 81 | 85 | 'performer/<action>/<performer_id:[\w-]+>' => 'performer/<action>', |
| 86 | + 'company/portfolio/<company_id:[\w-]+>/<type:(?:implementer|customer)>/<filter:[\d]+>' => 'company/portfolio-filter', | |
| 82 | 87 | 'company/portfolio/<company_id:[\w-]+>/<filter:[\d]+>' => 'company/portfolio-filter', |
| 88 | + 'company/portfolio-view/<company_id:[\w-]+>/<type:(?:implementer|customer)>/<portfolio_id:[\w-]+>' => 'company/portfolio-view', | |
| 83 | 89 | 'company/portfolio-view/<company_id:[\w-]+>/<portfolio_id:[\w-]+>' => 'company/portfolio-view', |
| 90 | + 'company/blog-view/<company_id:[\w-]+>/<type:(?:implementer|customer)>/<link:[\w-]+>' => 'company/blog-view', | |
| 84 | 91 | 'company/blog-view/<company_id:[\w-]+>/<link:[\w-]+>' => 'company/blog-view', |
| 92 | + 'company/vacancy-view/<company_id:[\w-]+>/<type:(?:implementer|customer)>/<link:[\w-_\s]+>' => 'company/vacancy-view', | |
| 85 | 93 | 'company/vacancy-view/<company_id:[\w-]+>/<link:[\w-_\s]+>' => 'company/vacancy-view', |
| 94 | + 'company/<action>/<company_id:[\w-]+><type:(?:implementer|customer)>' => 'company/<action>', | |
| 86 | 95 | 'company/<action>/<company_id:[\w-]+>' => 'company/<action>', |
| 87 | 96 | 'chat/message/<user_id:[\w-]>'=> 'chat/message', |
| 88 | 97 | 'tender/view/<tender_id:[\d-]+>' => 'tender/view', |
| 89 | - | |
| 90 | 98 | ] |
| 91 | 99 | ], |
| 92 | 100 | ], | ... | ... |
frontend/controllers/CompanyController.php
| ... | ... | @@ -46,12 +46,7 @@ |
| 46 | 46 | ]; |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | - public function actionIndex() | |
| 50 | - { | |
| 51 | - $this->redirect('site/index'); | |
| 52 | - } | |
| 53 | - | |
| 54 | - public function actionCommon($company_id) | |
| 49 | + public function actionCommon($company_id, $type = 'implementer') | |
| 55 | 50 | { |
| 56 | 51 | /** |
| 57 | 52 | * @var User $company |
| ... | ... | @@ -109,7 +104,7 @@ |
| 109 | 104 | ]); |
| 110 | 105 | } |
| 111 | 106 | |
| 112 | - public function actionPortfolio($company_id) | |
| 107 | + public function actionPortfolio($company_id, $type = 'implementer') | |
| 113 | 108 | { |
| 114 | 109 | $company = User::findOne($company_id); |
| 115 | 110 | |
| ... | ... | @@ -144,7 +139,7 @@ |
| 144 | 139 | ]); |
| 145 | 140 | } |
| 146 | 141 | |
| 147 | - public function actionPortfolioFilter($performer_id, $filter) | |
| 142 | + public function actionPortfolioFilter($performer_id, $filter, $type = 'implementer') | |
| 148 | 143 | { |
| 149 | 144 | $company = User::findOne($performer_id); |
| 150 | 145 | |
| ... | ... | @@ -187,7 +182,7 @@ |
| 187 | 182 | ]); |
| 188 | 183 | } |
| 189 | 184 | |
| 190 | - public function actionPortfolioView($company_id, $portfolio_id) | |
| 185 | + public function actionPortfolioView($company_id, $portfolio_id, $type = 'implementer') | |
| 191 | 186 | { |
| 192 | 187 | $user = User::findOne($company_id); |
| 193 | 188 | $portfolio = $user->getPortfolios() |
| ... | ... | @@ -200,7 +195,7 @@ |
| 200 | 195 | ]); |
| 201 | 196 | } |
| 202 | 197 | |
| 203 | - public function actionTeam($company_id) | |
| 198 | + public function actionTeam($company_id, $type = 'implementer') | |
| 204 | 199 | { |
| 205 | 200 | $company = User::findOne($company_id); |
| 206 | 201 | if(!$company instanceof User) { |
| ... | ... | @@ -227,7 +222,7 @@ |
| 227 | 222 | ]); |
| 228 | 223 | } |
| 229 | 224 | |
| 230 | - public function actionBlogList($company_id) | |
| 225 | + public function actionBlogList($company_id, $type = 'implementer') | |
| 231 | 226 | { |
| 232 | 227 | $company = User::findOne($company_id); |
| 233 | 228 | |
| ... | ... | @@ -261,7 +256,7 @@ |
| 261 | 256 | ]); |
| 262 | 257 | } |
| 263 | 258 | |
| 264 | - public function actionBlogView($company_id, $link) | |
| 259 | + public function actionBlogView($company_id, $link, $type = 'implementer') | |
| 265 | 260 | { |
| 266 | 261 | $company = User::findOne($company_id); |
| 267 | 262 | |
| ... | ... | @@ -285,7 +280,7 @@ |
| 285 | 280 | ]); |
| 286 | 281 | } |
| 287 | 282 | |
| 288 | - public function actionReview($company_id) | |
| 283 | + public function actionReview($company_id, $type = 'implementer') | |
| 289 | 284 | { |
| 290 | 285 | $company = User::findOne($company_id); |
| 291 | 286 | |
| ... | ... | @@ -294,7 +289,7 @@ |
| 294 | 289 | ]); |
| 295 | 290 | } |
| 296 | 291 | |
| 297 | - public function actionVacancyList($company_id) | |
| 292 | + public function actionVacancyList($company_id, $type = 'implementer') | |
| 298 | 293 | { |
| 299 | 294 | |
| 300 | 295 | $company = User::findOne($company_id); |
| ... | ... | @@ -325,7 +320,7 @@ |
| 325 | 320 | |
| 326 | 321 | } |
| 327 | 322 | |
| 328 | - public function actionVacancyView($company_id, $link) | |
| 323 | + public function actionVacancyView($company_id, $link, $type = 'implementer') | |
| 329 | 324 | { |
| 330 | 325 | $company = User::findOne($company_id); |
| 331 | 326 | $vacancy = $company->getVacancies() |
| ... | ... | @@ -366,7 +361,7 @@ |
| 366 | 361 | ]); |
| 367 | 362 | } |
| 368 | 363 | |
| 369 | - public function actionGallery($company_id) | |
| 364 | + public function actionGallery($company_id, $type = 'implementer') | |
| 370 | 365 | { |
| 371 | 366 | $company = User::findOne($company_id); |
| 372 | 367 | ... | ... |
frontend/controllers/PerformerController.php
| ... | ... | @@ -55,9 +55,8 @@ |
| 55 | 55 | ]; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - public function actionCommon($performer_id) | |
| 58 | + public function actionCommon($performer_id, $type = 'implementer') | |
| 59 | 59 | { |
| 60 | - | |
| 61 | 60 | $user = User::find() |
| 62 | 61 | ->where([ 'id' => $performer_id ]) |
| 63 | 62 | ->with('jobs') |
| ... | ... | @@ -88,7 +87,7 @@ |
| 88 | 87 | |
| 89 | 88 | } |
| 90 | 89 | |
| 91 | - public function actionPortfolio($performer_id) | |
| 90 | + public function actionPortfolio($performer_id, $type = 'implementer') | |
| 92 | 91 | { |
| 93 | 92 | $user = User::findOne($performer_id); |
| 94 | 93 | |
| ... | ... | @@ -124,7 +123,7 @@ |
| 124 | 123 | |
| 125 | 124 | } |
| 126 | 125 | |
| 127 | - public function actionPortfolioFilter($performer_id, $filter) | |
| 126 | + public function actionPortfolioFilter($performer_id, $filter, $type = 'implementer') | |
| 128 | 127 | { |
| 129 | 128 | $user = User::findOne($performer_id); |
| 130 | 129 | |
| ... | ... | @@ -167,7 +166,7 @@ |
| 167 | 166 | ]); |
| 168 | 167 | } |
| 169 | 168 | |
| 170 | - public function actionPortfolioView($performer_id, $portfolio_id) | |
| 169 | + public function actionPortfolioView($performer_id, $portfolio_id, $type = 'implementer') | |
| 171 | 170 | { |
| 172 | 171 | $user = User::findOne($performer_id); |
| 173 | 172 | $portfolio = $user->getPortfolios() |
| ... | ... | @@ -180,7 +179,7 @@ |
| 180 | 179 | ]); |
| 181 | 180 | } |
| 182 | 181 | |
| 183 | - public function actionProjects($performer_id) | |
| 182 | + public function actionProjects($performer_id, $type = 'implementer') | |
| 184 | 183 | { |
| 185 | 184 | $user = User::findOne($performer_id); |
| 186 | 185 | |
| ... | ... | @@ -201,7 +200,7 @@ |
| 201 | 200 | ]); |
| 202 | 201 | } |
| 203 | 202 | |
| 204 | - public function actionBlogList($performer_id) | |
| 203 | + public function actionBlogList($performer_id, $type = 'implementer') | |
| 205 | 204 | { |
| 206 | 205 | $user = User::findOne($performer_id); |
| 207 | 206 | |
| ... | ... | @@ -234,7 +233,7 @@ |
| 234 | 233 | ]); |
| 235 | 234 | } |
| 236 | 235 | |
| 237 | - public function actionBlogView($performer_id, $link) | |
| 236 | + public function actionBlogView($performer_id, $link, $type = 'implementer') | |
| 238 | 237 | { |
| 239 | 238 | $user = User::findOne($performer_id); |
| 240 | 239 | |
| ... | ... | @@ -257,7 +256,7 @@ |
| 257 | 256 | ]); |
| 258 | 257 | } |
| 259 | 258 | |
| 260 | - public function actionReview($performer_id) | |
| 259 | + public function actionReview($performer_id, $type = 'implementer') | |
| 261 | 260 | { |
| 262 | 261 | $user = User::findOne($performer_id); |
| 263 | 262 | |
| ... | ... | @@ -270,7 +269,7 @@ |
| 270 | 269 | ]); |
| 271 | 270 | } |
| 272 | 271 | |
| 273 | - public function actionWorkplace($performer_id) | |
| 272 | + public function actionWorkplace($performer_id, $type = 'implementer') | |
| 274 | 273 | { |
| 275 | 274 | $user = User::find() |
| 276 | 275 | ->where([ 'id' => $performer_id ]) |
| ... | ... | @@ -285,7 +284,7 @@ |
| 285 | 284 | ]); |
| 286 | 285 | } |
| 287 | 286 | |
| 288 | - public function actionGallery($performer_id) | |
| 287 | + public function actionGallery($performer_id, $type = 'implementer') | |
| 289 | 288 | { |
| 290 | 289 | $user = User::findOne($performer_id); |
| 291 | 290 | |
| ... | ... | @@ -322,4 +321,12 @@ |
| 322 | 321 | 'videos' => $videos, |
| 323 | 322 | ]); |
| 324 | 323 | } |
| 324 | + | |
| 325 | + public function beforeAction($action) | |
| 326 | + { | |
| 327 | + if(!empty(\Yii::$app->request->get('type'))) { | |
| 328 | + $action->controller->view->params['type'] = \Yii::$app->request->get('type'); | |
| 329 | + } | |
| 330 | + return parent::beforeAction($action); | |
| 331 | + } | |
| 325 | 332 | } | ... | ... |
frontend/views/layouts/performer.php
| ... | ... | @@ -13,7 +13,6 @@ |
| 13 | 13 | |
| 14 | 14 | \frontend\assets\AppAsset::register($this); |
| 15 | 15 | $this->beginContent('@app/views/layouts/main.php'); |
| 16 | - | |
| 17 | 16 | ?> |
| 18 | 17 | <div class="section-box content"> |
| 19 | 18 | <div class="section-box-16" style="background: url('<?= $this->params[ 'user' ]->userInfo->poster; ?>') 50% no-repeat"> |
| ... | ... | @@ -62,6 +61,7 @@ |
| 62 | 61 | 'url' => [ |
| 63 | 62 | 'performer/common', |
| 64 | 63 | 'performer_id' => $this->params[ 'user' ]->id, |
| 64 | + 'type' => (!empty($this->params['type']))?$this->params['type']:null, | |
| 65 | 65 | ], |
| 66 | 66 | ], |
| 67 | 67 | [ |
| ... | ... | @@ -69,6 +69,7 @@ |
| 69 | 69 | 'url' => [ |
| 70 | 70 | 'performer/portfolio', |
| 71 | 71 | 'performer_id' => $this->params[ 'user' ]->id, |
| 72 | + 'type' => (!empty($this->params['type']))?$this->params['type']:null, | |
| 72 | 73 | ], |
| 73 | 74 | ], |
| 74 | 75 | [ |
| ... | ... | @@ -76,6 +77,7 @@ |
| 76 | 77 | 'url' => [ |
| 77 | 78 | 'performer/projects', |
| 78 | 79 | 'performer_id' => $this->params[ 'user' ]->id, |
| 80 | + 'type' => (!empty($this->params['type']))?$this->params['type']:null, | |
| 79 | 81 | ], |
| 80 | 82 | ], |
| 81 | 83 | [ |
| ... | ... | @@ -83,6 +85,7 @@ |
| 83 | 85 | 'url' => [ |
| 84 | 86 | 'performer/blog-list', |
| 85 | 87 | 'performer_id' => $this->params[ 'user' ]->id, |
| 88 | + 'type' => (!empty($this->params['type']))?$this->params['type']:null, | |
| 86 | 89 | ], |
| 87 | 90 | ], |
| 88 | 91 | [ |
| ... | ... | @@ -90,6 +93,7 @@ |
| 90 | 93 | 'url' => [ |
| 91 | 94 | 'performer/review', |
| 92 | 95 | 'performer_id' => $this->params[ 'user' ]->id, |
| 96 | + 'type' => (!empty($this->params['type']))?$this->params['type']:null, | |
| 93 | 97 | ], |
| 94 | 98 | ], |
| 95 | 99 | [ |
| ... | ... | @@ -97,6 +101,7 @@ |
| 97 | 101 | 'url' => [ |
| 98 | 102 | 'performer/workplace', |
| 99 | 103 | 'performer_id' => $this->params[ 'user' ]->id, |
| 104 | + 'type' => (!empty($this->params['type']))?$this->params['type']:null, | |
| 100 | 105 | ], |
| 101 | 106 | ], |
| 102 | 107 | [ |
| ... | ... | @@ -104,6 +109,7 @@ |
| 104 | 109 | 'url' => [ |
| 105 | 110 | 'performer/gallery', |
| 106 | 111 | 'performer_id' => $this->params[ 'user' ]->id, |
| 112 | + 'type' => (!empty($this->params['type']))?$this->params['type']:null, | |
| 107 | 113 | ], |
| 108 | 114 | ], |
| 109 | 115 | ], |
| ... | ... | @@ -145,6 +151,7 @@ |
| 145 | 151 | <?= Html::a('написать отзыв', [ |
| 146 | 152 | 'performer/review', |
| 147 | 153 | 'performer_id' => $this->params[ 'user' ]->id, |
| 154 | + 'type' => (!empty($this->params['type']))?$this->params['type']:null, | |
| 148 | 155 | ], [ 'class' => 'performance-vacancy-sidebar-write style' ]) ?> |
| 149 | 156 | </div> |
| 150 | 157 | <div class="performer-vacancy-sidebar-img style"> | ... | ... |