github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-04-25 14:14:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix following discussion list filter

Browse Source
This commit is contained in:
Toby Zerner 2015-07-27 12:44:45 +09:30
parent d6fe156e89
commit bb8232297f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/subscriptions/js/forum/src/addSubscriptionFilter.js
View File

@ -19,8 +19,8 @@ export default function addSubscriptionControls() {
}); });
extend(DiscussionList.prototype, 'requestParams', function(params) { extend(DiscussionList.prototype, 'requestParams', function(params) {
if (params.filter === 'following') { if (this.props.params.filter === 'following') {
params.q = (params.q || '') + ' is:following'; params.filter.q = (params.filter.q || '') + ' is:following';
} }
}); });
} }

2
extensions/subscriptions/src/Gambits/SubscriptionGambit.php
View File

@ -14,7 +14,7 @@ class SubscriptionGambit extends RegexGambit
// might be better as `id IN (subquery)`? // might be better as `id IN (subquery)`?
$method = $negate ? 'whereNotExists' : 'whereExists'; $method = $negate ? 'whereNotExists' : 'whereExists';
$search->getQuery()->$method(function ($query) use ($actor, $matches) { $search->getQuery()->$method(function ($query) use ($actor, $matches) {
$query->select(app('db')->raw(1)) $query->select(app('flarum.db')->raw(1))
->from('users_discussions') ->from('users_discussions')
->whereRaw('discussion_id = discussions.id') ->whereRaw('discussion_id = discussions.id')
->where('user_id', $actor->id) ->where('user_id', $actor->id)