ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-16 23:00:51 +03:00
Code Issues Releases Wiki Activity

fix #470 - В поиск по личке кроме поля "Отправитель" добавить поле "Получатель"

Browse source
This commit is contained in:
Mzhelskiy Maxim 2014-06-13 10:55:03 +07:00
parent 3a51459ab7
commit 222d9ba80f
4 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
application/classes/actions/ActionTalk.class.php
View file

@ -291,6 +291,12 @@ class ActionTalk extends Action {
if($sender=getRequest('sender') and is_string($sender)){
$aFilter['user_login']=urldecode($sender);
}
/**
* Отправитель
*/
if($sReceiver=urldecode(getRequestStr('receiver')) and $oUserReceiver=$this->User_GetUserByLogin($sReceiver)){
$aFilter['receiver_user_id']=$oUserReceiver->getId();
}
/**
* Искать только в избранных письмах
*/

11
application/classes/modules/talk/mapper/Talk.mapper.class.php
View file

@ -424,6 +424,16 @@ class ModuleTalk_MapperTalk extends Mapper {
{ AND t.talk_text LIKE ? }
{ AND u.user_login = ? }
{ AND t.user_id = ? }
{ AND tu.talk_id IN (
SELECT stu.talk_id
FROM
".Config::Get('db.table.talk_user')." as stu,
".Config::Get('db.table.talk')." as st
WHERE
stu.user_id = ?d
AND stu.talk_id = st.talk_id
AND st.user_id != stu.user_id
) }
ORDER BY t.talk_date_last desc, t.talk_date desc
LIMIT ?d, ?d
";
@ -443,6 +453,7 @@ class ModuleTalk_MapperTalk extends Mapper {
(!empty($aFilter['text_like']) ? $aFilter['text_like'] : DBSIMPLE_SKIP),
(!empty($aFilter['user_login']) ? $aFilter['user_login'] : DBSIMPLE_SKIP),
(!empty($aFilter['sender_id']) ? $aFilter['sender_id'] : DBSIMPLE_SKIP),
(!empty($aFilter['receiver_user_id']) ? $aFilter['receiver_user_id'] : DBSIMPLE_SKIP),
($iCurrPage-1)*$iPerPage,
$iPerPage
)

4
application/frontend/i18n/ru.php
View file

@ -374,6 +374,10 @@ return array(
'label' => 'Отправитель',
'note' => 'Укажите логин отправителя'
),
'receiver' => array(
'label' => 'Получатель',
'note' => 'Укажите логин получателя'
),
'keyword' => array(
'label' => 'Искать в заголовке',
),

9
application/frontend/skin/developer/actions/ActionTalk/search.tpl
View file

@ -12,7 +12,14 @@
sName = 'sender'
sLabel = $aLang.messages.search.fields.sender.label
sNote = $aLang.messages.search.fields.sender.note
sClasses = 'width-full autocomplete-users-sep'}
sInputClasses = 'width-full autocomplete-users'}
{* Получатель *}
{include 'components/field/field.text.tpl'
sName = 'receiver'
sLabel = $aLang.messages.search.fields.receiver.label
sNote = $aLang.messages.search.fields.receiver.note
sInputClasses = 'width-full autocomplete-users'}
{* Искать в заголовке *}
{include 'components/field/field.text.tpl'