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

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
nwb 2014-07-03 10:12:46 +08:00
parent 31e338f1e5 050a780b50
commit 2d9e0d507e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/users_controller.rb
View File

@ -52,6 +52,7 @@ class UsersController < ApplicationController
helper :custom_fields helper :custom_fields
include CustomFieldsHelper include CustomFieldsHelper
include AvatarHelper include AvatarHelper
include WordsHelper
# added by liuping 关注 # added by liuping 关注
@ -235,6 +236,9 @@ class UsersController < ApplicationController
def user_newfeedback def user_newfeedback
@jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC') @jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
@jours.update_all(:is_readed => true, :status => false) @jours.update_all(:is_readed => true, :status => false)
@jours.each do |journal|
fetch_user_leaveWord_reply(journal).update_all(:is_readed => true, :status => false)
end
@limit = 10 @limit = 10
@feedback_count = @jours.count @feedback_count = @jours.count

1
app/controllers/words_controller.rb
View File

@ -57,6 +57,7 @@ class WordsController < ApplicationController
reply_id = params[:reference_message_id] # 暂时不实现 reply_id = params[:reference_message_id] # 暂时不实现
content = params[:user_notes] content = params[:user_notes]
options = {:user_id => author_id, options = {:user_id => author_id,
:status => true,
:m_parent_id => parent_id, :m_parent_id => parent_id,
:m_reply_id => reply_id, :m_reply_id => reply_id,
:reply_id => reply_user_id, :reply_id => reply_user_id,