diff --git a/protected/humhub/modules/notification/models/Notification.php b/protected/humhub/modules/notification/models/Notification.php index c27c7d3a01..7f30e70c4e 100644 --- a/protected/humhub/modules/notification/models/Notification.php +++ b/protected/humhub/modules/notification/models/Notification.php @@ -228,7 +228,7 @@ public static function loadMore($from = 0, $limit = 6) $query = Notification::findGrouped(); if ($from != 0) { - $query->andWhere(['<', 'id', $from]); + $query->andWhere(['<', 'notification.id', $from]); } $query->limit($limit); @@ -258,7 +258,7 @@ public static function findGrouped(User $user = null, $sendWebNotifications = 1) new Expression('min(notification.seen) as group_seen'), ]); - $query->andWhere(['user_id' => $user->id]); + $query->andWhere(['notification.user_id' => $user->id]); // Exclude all not published contents $query->leftJoin('content', 'content.object_model = notification.source_class AND content.object_id = notification.source_pk') @@ -288,8 +288,8 @@ public static function findGrouped(User $user = null, $sendWebNotifications = 1) public static function findUnseen(User $user = null) { return Notification::findGrouped($user) - ->andWhere(['seen' => 0]) - ->orWhere(['IS', 'seen', new Expression('NULL')]); + ->andWhere(['notification.seen' => 0]) + ->orWhere(['IS', 'notification.seen', new Expression('NULL')]); } /** @@ -302,7 +302,7 @@ public static function findUnseen(User $user = null) */ public static function findUnnotifiedInFrontend(User $user = null) { - return self::findUnseen($user)->andWhere(['desktop_notified' => 0]); + return self::findUnseen($user)->andWhere(['notification.desktop_notified' => 0]); } } diff --git a/protected/humhub/modules/notification/models/forms/FilterForm.php b/protected/humhub/modules/notification/models/forms/FilterForm.php index ea1a6bea49..baf2f9ebdf 100644 --- a/protected/humhub/modules/notification/models/forms/FilterForm.php +++ b/protected/humhub/modules/notification/models/forms/FilterForm.php @@ -146,7 +146,7 @@ public function createQuery(): ActiveQuery $this->query = Notification::findGrouped(); if ($this->hasFilter()) { - $this->query->andFilterWhere(['not in', 'class', $this->getExcludeClassFilter()]); + $this->query->andFilterWhere(['not in', 'notification.class', $this->getExcludeClassFilter()]); } return $this->query;