1.解决组织动态中删除发送过来的帖子报404的问题;2.组织消息的状态能更新

dev_hjq
ouyangxuhua 10 years ago
parent 125f00689b
commit b7f1177938

@ -192,11 +192,13 @@ class UsersController < ApplicationController
forge_querys = ForgeMessage.where("user_id =? and viewed =?", user, 0)
user_querys = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0)
forum_querys = MemoMessage.where("user_id =? and viewed =?", user, 0)
org_querys = OrgMessage.where("user_id=? and viewed=0", user)
if User.current.id == @user.id
course_querys.update_all(:viewed => true)
forge_querys.update_all(:viewed => true)
user_querys.update_all(:viewed => true)
forum_querys.update_all(:viewed => true)
org_querys.update_all(:viewed => true)
end
end

@ -89,10 +89,11 @@ module UsersHelper
def unviewed_message(user)
course_count = CourseMessage.where("user_id =? and viewed =?", user, 0).count
forge_count = ForgeMessage.where("user_id =? and viewed =?", user, 0).count
org_count = OrgMessage.where("user_id =? and viewed =?", user, 0).count
user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0).count
user_memo_count = MemoMessage.where("user_id =? and viewed =?", user, 0).count
at_count = user.at_messages.where(viewed: false).count
messages_count = course_count + forge_count + user_feedback_count + user_memo_count + at_count
messages_count = course_count + forge_count + user_feedback_count + user_memo_count + at_count + org_count
end
def user_mail_notification_options(user)

@ -57,8 +57,10 @@
) if activity.org_subfield_editable_by?(User.current) %>
</li>
<li>
<%= delete_link(
<%= link_to(
l(:button_delete),
{:controller => 'messages', :action => 'destroy', :id => activity, :board_id => activity.board_id},
:method => 'post',
:data => {:confirm => l(:text_are_you_sure)},
:class => 'postOptionLink'
) if activity.org_subfield_editable_by?(User.current) %>

Loading…
Cancel
Save