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:
cxt 2015-08-18 09:18:10 +08:00
parent ebd056a4b9 545b07a34c
commit bc993e3b5c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/users_controller.rb
View File

@ -109,19 +109,19 @@ class UsersController < ApplicationController
end
if @user.course_messages
if params[:type].nil?
@user_course_messages = @user.course_messages
@user_project_messges = @user.forge_messages
@user_course_messages = @user.course_messages.reverse
@user_project_messges = @user.forge_messages.reverse
else
case params[:type]
when 'homework'
@user_course_messages = @user.course_messages.select{|x| x.course_message_type == "HomeworkCommon"}
@user_course_messages = @user.course_messages.reverse.select{|x| x.course_message_type == "HomeworkCommon"}
#@user_course_messages = ForgeMessage.find_by_sql("select * from course_messages where user_id='#{@user.id}' and course_message_type = 'HomeworkCommon' order by created_at desc;")
when 'message'
@user_course_messages = @user.course_messages.select{|x| x.course_message_type == "Message"}
@user_course_messages = @user.course_messages.reverse.select{|x| x.course_message_type == "Message"}
when 'news'
@user_course_messages = @user.course_messages.select{|x| x.course_message_type == "News"}
@user_course_messages = @user.course_messages.reverse.select{|x| x.course_message_type == "News"}
when 'poll'
@user_course_messages = @user.course_messages.select{|x| x.course_message_type == "Poll"}
@user_course_messages = @user.course_messages.reverse.select{|x| x.course_message_type == "Poll"}
end
end
respond_to do |format|