Backport（バックポート） #3158 » opCommunityTopicPluginTopicActions.diff
| lib/action/opCommunityTopicPluginTopicActions.class.php | ||
|---|---|---|
|
$this->pageUrl .= '?id='.$this->communityId;
|
||
|
}
|
||
|
|
||
|
$q = $table->getSearchQuery($request->getParameter('id'), $request->getParameter('target'), $request->getParameter('keyword'));
|
||
|
$q = $table->getSearchQuery($request->getParameter('id'), $request->getParameter('target'), $request->getParameter('keyword'), $this->getUser()->getMemberId());
|
||
|
$this->pager = $table->getResultListPager($q, $request->getParameter('page'));
|
||
|
|
||
|
$this->isResult = false;
|
||
| lib/model/doctrine/PluginCommunityTopicTable.class.php | ||
|---|---|---|
|
return $pager;
|
||
|
}
|
||
|
|
||
|
public function getSearchQuery($communityId = null, $target = null, $keyword = null)
|
||
|
public function getSearchQuery($communityId = null, $target = null, $keyword = null, $memberId = null)
|
||
|
{
|
||
|
$q = $this->createQuery();
|
||
|
|
||
| ... | ... | |
|
}
|
||
|
}
|
||
|
|
||
|
$q->andWhereIn('community_id', opCommunityTopicToolkit::getPublicCommunityIdList())
|
||
|
$targetCommunityIds = opCommunityTopicToolkit::getPublicCommunityIdList();
|
||
|
if (!is_null($memberId))
|
||
|
{
|
||
|
$targetCommunityIds = array_merge($targetCommunityIds,
|
||
|
Doctrine_Core::getTable('Community')->getIdsByMemberId($memberId));
|
||
|
}
|
||
|
|
||
|
$q->andWhereIn('community_id', $targetCommunityIds)
|
||
|
->orderBy('updated_at DESC');
|
||
|
|
||
|
return $q;
|
||