diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 0b844fb14..d0b3f91be 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -108,25 +108,26 @@ class UsersController < ApplicationController # querys.update_all(:viewed => true) # end if @user.course_messages - if params[:type].nil? - @user_course_messages = @user.course_messages.reverse - @user_project_messges = @user.forge_messages.reverse - else case params[:type] + when nil + @user_course_messages = @user.course_messages.reverse + @user_project_messges = @user.forge_messages.reverse when 'homework' - @user_course_messages = CourseMessage.where(:course_message_type => "HomeworkCommon", :user_id => @user) + @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "HomeworkCommon", @user).order("created_at desc") when 'message' - @user_course_messages = CourseMessage.where(:course_message_type => "Message", :user_id => @user) + @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc") + # @user_course_messages = CourseMessage.where(:course_message_type => "Message", :user_id => @user).reverse when 'news' - @user_course_messages = CourseMessage.where(:course_message_type => "News", :user_id => @user) + @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "News", @user).order("created_at desc") when 'poll' - @user_course_messages = CourseMessage.where(:course_message_type => "Poll", :user_id => @user) + @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc") + when "" + when 'issue' + @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "Issue", @user).order("created_at desc") + end + respond_to do |format| + format.html{render :layout=>'base_users_new'} end - end - respond_to do |format| - format.html{render :layout=>'base_users_new'} - format.api - end end end