|
|
|
@ -112,8 +112,8 @@ class UsersController < ApplicationController
|
|
|
|
|
case params[:type]
|
|
|
|
|
when nil
|
|
|
|
|
@message_alls = []
|
|
|
|
|
system_message_types = MessageAll.where("message_type =?", "SystemMessage")
|
|
|
|
|
messages = MessageAll.where("user_id =? and message_type !=?" ,@user, "SystemMessage")
|
|
|
|
|
system_message_types = MessageAll.where("message_type =?", "SystemMessage").order("created_at desc")
|
|
|
|
|
messages = MessageAll.where("user_id =? and message_type !=?" ,@user, "SystemMessage").order("created_at desc")
|
|
|
|
|
messages.each do |message_all|
|
|
|
|
|
@message_alls << message_all.message
|
|
|
|
|
end
|
|
|
|
|