Merge remote-tracking branch 'origin/master'

Administrator
2 parents be455470 1f651082
Showing 4 changed files with 36 additions and 10 deletions Show diff stats
frontend/controllers/CompanyController.php
frontend/controllers/PerformerController.php
frontend/views/company/portfolio-view.php
frontend/views/performer/portfolio-view.php
@@ -83,6 +83,13 @@ class CompanyController extends Controller
         ]);
     }
  
+    public function actionPortfolioView($company_id /*, $portfolio_id*/)
+    {
+        $company = User::findOne($company_id);
+
+        return $this->render('portfolio-view', ['company' => $company]);
+    }
+
     public function actionTeam($company_id)
     {
         $company = User::findOne($company_id);
@@ -23,9 +23,7 @@ class PerformerController extends Controller
 {
     public $layout = 'performer';
     public $user;
-
-
-
+    public $defaultAction = 'common';
  
     /**
      * @inheritdoc
@@ -43,13 +41,6 @@ class PerformerController extends Controller
         ];
     }
  
-
-    public function actionIndex()
-    {
-        $this->redirect('site/index');
-
-    }
-
     public function actionCommon($performer_id)
     {
  
@@ -139,6 +130,12 @@ class PerformerController extends Controller
         ]);
     }
  
+    public function actionPortfolioView($performer_id/*, $portfolio_id*/)
+    {
+        $user = User::findOne($performer_id);
+        return $this->render('portfolio-view', ['user' => $user]);
+    }
+
     public function actionBlogList($performer_id)
     {
         $user = User::findOne($performer_id);
+<?php
+
+use \yii\helpers\Html;
+
+/* @var $this yii\web\View
+ * @var $company common\models\User
+ */
+$this->params['company'] = $company;
+
+$this->title = 'My Yii Application';
+?>
 \ No newline at end of file
+<?php
+
+use \yii\helpers\Html;
+
+/* @var $this yii\web\View
+ * @var $user common\models\User
+ */
+$this->params['user'] = $user;
+
+$this->title = 'My Yii Application';
+?>
 \ No newline at end of file