|
|
|
@ -18,17 +18,10 @@ class WordsController < ApplicationController
|
|
|
|
|
list = User.find(refer_user_id).add_jour(User.current, message, refer_user_id)
|
|
|
|
|
end
|
|
|
|
|
@jour = list.last
|
|
|
|
|
# @user.count_new_jour
|
|
|
|
|
# if a_message.size > 5
|
|
|
|
|
# @message = a_message[-5, 5]
|
|
|
|
|
# else
|
|
|
|
|
# @message = a_message
|
|
|
|
|
# end
|
|
|
|
|
# @message_count = a_message.count
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
# @jours = @user.journals_for_messages.where('m_parent_id IS NULL').reverse
|
|
|
|
|
# @jour = paginateHelper @jours,10
|
|
|
|
|
jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
|
|
|
|
|
@jour = paginateHelper jours,10
|
|
|
|
|
|
|
|
|
|
respond_to do |format|
|
|
|
|
|
format.js
|
|
|
|
@ -91,7 +84,6 @@ class WordsController < ApplicationController
|
|
|
|
|
end
|
|
|
|
|
respond_to do |format|
|
|
|
|
|
format.js
|
|
|
|
|
#format.api { render_api_ok }
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
@ -204,7 +196,15 @@ class WordsController < ApplicationController
|
|
|
|
|
flash[:error] = feedback.errors.full_messages[0]
|
|
|
|
|
redirect_to project_feedback_url(params[:id])
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
#给用户留言
|
|
|
|
|
def leave_user_message
|
|
|
|
|
@user = User.find(params[:id])
|
|
|
|
|
if params[:new_form][:user_message].size>0 && User.current.logged? && @user
|
|
|
|
|
@user.add_jour(User.current, params[:new_form][:user_message])
|
|
|
|
|
end
|
|
|
|
|
redirect_to feedback_path(@user)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
# add by nwb
|
|
|
|
|