jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

消息列表添加未读消息统计和“全部设为已读”功能 

个人留言添加登录验证功能
This commit is contained in:
huang 2015-09-06 16:50:03 +08:00
parent d274b675db
commit b89218a1b3
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/controllers/users_controller.rb
View File

@ -102,22 +102,22 @@ class UsersController < ApplicationController
# issue：问题；journal：缺陷状态更新； forum：公共贴吧: user_feedback: 用户留言; new_reply:新闻回复（comment） # issue：问题；journal：缺陷状态更新； forum：公共贴吧: user_feedback: 用户留言; new_reply:新闻回复（comment）
def user_messages def user_messages
unless User.current.logged? unless User.current.logged?
render_403 redirect_to signin_url
return return
end end
# 当前用户查看消息，则设置消息为已读 # 当前用户查看消息，则设置消息为已读
#if params[:viewed] == "all" if params[:viewed] == "all"
# course_querys = @user.course_messages course_querys = @user.course_messages
# forge_querys = @user.forge_messages forge_querys = @user.forge_messages
# user_querys = @user.user_feedback_messages user_querys = @user.user_feedback_messages
# forum_querys = @user.memo_messages forum_querys = @user.memo_messages
# if User.current.id == @user.id if User.current.id == @user.id
# course_querys.update_all(:viewed => true) course_querys.update_all(:viewed => true)
# forge_querys.update_all(:viewed => true) forge_querys.update_all(:viewed => true)
# user_querys.update_all(:viewed => true) user_querys.update_all(:viewed => true)
# forum_querys.update_all(:viewed => true) forum_querys.update_all(:viewed => true)
# end end
#end end
# @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count # @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count
case params[:type] case params[:type]
when nil when nil
@ -540,6 +540,10 @@ class UsersController < ApplicationController
# modified by fq # modified by fq
def user_newfeedback def user_newfeedback
unless User.current.logged?
redirect_to signin_url
return
end
# 更新用户留言消息状态 # 更新用户留言消息状态
@user.journals_for_messages.each do |jour_message| @user.journals_for_messages.each do |jour_message|
jour_message.user_feedback_messages.each do |userfeedback_message| jour_message.user_feedback_messages.each do |userfeedback_message|

6
app/views/users/user_messages.html.erb
View File

@ -29,7 +29,11 @@
</div> </div>
<div class="resources mt10" id="users_setting"> <div class="resources mt10" id="users_setting">
<div> <div>
<% if params[:type].nil? %>
<div class="newsReadSetting">
有&nbsp;<span class="c_red"><%= User.current.count_new_message %></span>&nbsp;条未读<a href="javascript:void(0);" class="ml15"><%= link_to "全部设为已读", user_message_path(User.current, :viewed => 'all') %></a>
</div>
<% end %>
<% if @message_alls.count >0 %> <% if @message_alls.count >0 %>
<%# 课程消息 %> <%# 课程消息 %>
<% unless @message_alls.nil? %> <% unless @message_alls.nil? %>