|
|
@ -107,17 +107,18 @@ class UsersController < ApplicationController
|
|
|
|
end
|
|
|
|
end
|
|
|
|
# 记录当前点击按钮的时间
|
|
|
|
# 记录当前点击按钮的时间
|
|
|
|
# 考虑到用户未退出刷新消息页面
|
|
|
|
# 考虑到用户未退出刷新消息页面
|
|
|
|
if OnclickTime.where("user_id =?", User.current).first.nil?
|
|
|
|
message_time = OnclickTime.where("user_id =?", User.current).first
|
|
|
|
|
|
|
|
if message_time.nil?
|
|
|
|
message_new_time = OnclickTime.new
|
|
|
|
message_new_time = OnclickTime.new
|
|
|
|
message_new_time.user_id = User.current.id
|
|
|
|
message_new_time.user_id = User.current.id
|
|
|
|
message_new_time.onclick_time = Time.now
|
|
|
|
message_new_time.onclick_time = Time.now
|
|
|
|
message_new_time.save
|
|
|
|
message_new_time.save
|
|
|
|
else
|
|
|
|
else
|
|
|
|
message_new_time = OnclickTime.where("user_id =?", User.current).first
|
|
|
|
# 24小时内显示
|
|
|
|
message_last_time = message_new_time.onclick_time
|
|
|
|
contrast_time = Time.now - 86400
|
|
|
|
message_new_time.update_attributes(:onclick_time => Time.now)
|
|
|
|
message_time.update_attributes(:onclick_time => Time.now)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
@user_system_messages = SystemMessage.where("created_at >?", message_last_time).order("created_at desc")
|
|
|
|
@user_system_messages = SystemMessage.where("created_at >?", contrast_time).order("created_at desc")
|
|
|
|
# 当前用户查看消息,则设置消息为已读
|
|
|
|
# 当前用户查看消息,则设置消息为已读
|
|
|
|
if params[:viewed] == "all"
|
|
|
|
if params[:viewed] == "all"
|
|
|
|
course_querys = @user.course_messages
|
|
|
|
course_querys = @user.course_messages
|
|
|
|