Fix shared events obtaining.

dvaganov · Jun 6, 2016 · 633ff99 · 633ff99
1 parent 190f471
commit 633ff99
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/controllers/CalendarController.php b/controllers/CalendarController.php
@@ -37,11 +37,9 @@ public function behaviors()
     public function actionIndex()
     {
         $searchModel = new CalendarSearch();
-
-        $dataProviderMy = $searchModel->byOwner(\Yii::$app->user->id);
-
         $access = Access::find()->whereGuest(\Yii::$app->user->id)->all();
 
+        $dataProviderMy = $searchModel->byOwner(\Yii::$app->user->id);
         $dataProviderShared = $searchModel->searchShared($access);
 
         return $this->render('index', [

diff --git a/models/query/CalendarQuery.php b/models/query/CalendarQuery.php
@@ -52,7 +52,6 @@ public function whereOwner($userID)
 
     public function withUserAndDate($userID, $date)
     {
-        echo $userID . $date;
         return $this->orWhere([
                 'and', 'creatorID = :userID',
                 ['like', 'dateEvent', $date]

diff --git a/models/search/CalendarSearch.php b/models/search/CalendarSearch.php
@@ -68,21 +68,34 @@ public function search($params)
         return $dataProvider;
     }
 
+    /**
+     * Creates data provider instance with own events
+     * @param int $ownerID
+     * @return ActiveDataProvider
+     */
     public function byOwner($ownerID)
     {
         $query = Calendar::find()->whereOwner($ownerID);
         return new ActiveDataProvider(['query' => $query]);
     }
 
     /**
+     * Creates data provider instance with shared events
      * @param \app\models\Access $accesses
+     * @return ActiveDataProvider
      */
     public function searchShared($accesses)
     {
         $query = Calendar::find();
+
         foreach($accesses as $access) {
             $query->withUserAndDate($access->ownerID, $access->date);
         }
+
+        if (is_null($query->sql)) {
+            $query->where('0 = 1');
+        }
+
         return new ActiveDataProvider(['query' => $query]);
     }
 }