fix: messages list status select
This commit is contained in:
parent
a0b6041394
commit
a8c75f3b20
|
@ -65,8 +65,9 @@ class Users::MessagesController < Users::BaseController
|
||||||
@message_status = begin
|
@message_status = begin
|
||||||
case params[:status]
|
case params[:status]
|
||||||
when "1" then 1
|
when "1" then 1
|
||||||
|
when "2" then 2
|
||||||
else
|
else
|
||||||
2
|
-1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -75,15 +76,6 @@ class Users::MessagesController < Users::BaseController
|
||||||
params.permit(:atmeable_type, :atmeable_id, receivers_login: [])
|
params.permit(:atmeable_type, :atmeable_id, receivers_login: [])
|
||||||
end
|
end
|
||||||
|
|
||||||
def message_params
|
|
||||||
{
|
|
||||||
sender: current_user.id,
|
|
||||||
reservers: @receiver.id,
|
|
||||||
type: @message_type,
|
|
||||||
content: params[:content]
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
def find_receivers
|
def find_receivers
|
||||||
@receivers = User.where(login: params[:receivers_login])
|
@receivers = User.where(login: params[:receivers_login])
|
||||||
return render_not_found if @receivers.size == 0
|
return render_not_found if @receivers.size == 0
|
||||||
|
|
|
@ -16,19 +16,11 @@ class Notice::Read::ListService < Notice::Read::ClientService
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def request_status
|
|
||||||
case status
|
|
||||||
when 1 then 1
|
|
||||||
else
|
|
||||||
2
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def request_params
|
def request_params
|
||||||
{
|
{
|
||||||
receiver: receiver,
|
receiver: receiver,
|
||||||
page: page,
|
page: page,
|
||||||
show: request_status,
|
status: status,
|
||||||
size: size,
|
size: size,
|
||||||
type: type
|
type: type
|
||||||
}.stringify_keys
|
}.stringify_keys
|
||||||
|
|
Loading…
Reference in New Issue