|
|
|
|
@ -45,14 +45,14 @@ class UsersController < ApplicationController
|
|
|
|
|
:activity_new_score_index, :influence_new_score_index, :score_new_index,:update_score,:user_activities,:user_projects_index,
|
|
|
|
|
:user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,
|
|
|
|
|
:user_resource,:user_resource_create,:user_resource_delete,:rename_resource,:search_user_course,:add_exist_file_to_course,
|
|
|
|
|
:search_user_project,:resource_preview,:resource_search,:add_exist_file_to_project,:user_messages, :user_messages_new,:edit_brief_introduction]
|
|
|
|
|
:search_user_project,:resource_preview,:resource_search,:add_exist_file_to_project,:user_messages, :edit_brief_introduction]
|
|
|
|
|
#edit has been deleted by huang, 2013-9-23
|
|
|
|
|
before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :user_courses,
|
|
|
|
|
:user_homeworks, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments,
|
|
|
|
|
:watch_contests, :info, :watch_projects, :show_score, :topic_score_index, :project_score_index,
|
|
|
|
|
:activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
|
|
|
|
|
:activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource,
|
|
|
|
|
:user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction, :user_messages_new]
|
|
|
|
|
:user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction]
|
|
|
|
|
before_filter :auth_user_extension, only: :show
|
|
|
|
|
#before_filter :rest_user_score, only: :show
|
|
|
|
|
#before_filter :select_entry, only: :user_projects
|
|
|
|
|
@ -201,90 +201,6 @@ class UsersController < ApplicationController
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def user_messages_new
|
|
|
|
|
unless User.current.logged?
|
|
|
|
|
render_403
|
|
|
|
|
return
|
|
|
|
|
end
|
|
|
|
|
# 当前用户查看消息，则设置消息为已读
|
|
|
|
|
course_querys = @user.course_messages
|
|
|
|
|
forge_querys = @user.forge_messages
|
|
|
|
|
user_querys = @user.user_feedback_messages
|
|
|
|
|
forum_querys = @user.memo_messages
|
|
|
|
|
# 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)
|
|
|
|
|
# end
|
|
|
|
|
@new_message_count = @user.forge_messages.count + @user.memo_messages.count + @user.course_messages.count + @user.user_feedback_messages.count
|
|
|
|
|
case params[:type]
|
|
|
|
|
when nil
|
|
|
|
|
@message_alls = []
|
|
|
|
|
messages = MessageAll.where("user_id =?",@user).order("created_at desc")
|
|
|
|
|
messages.each do |message_all|
|
|
|
|
|
@message_alls << message_all.message
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
# @user_course_messages = MessageAll.where("user_id =? and message_type=?",@user,"CourseMessage").order("created_at desc")
|
|
|
|
|
# @user_forge_messages = MessageAll.where("user_id =? and message_type=?",@user,"ForgeMessage").order("created_at desc")
|
|
|
|
|
# @user_memo_messages = MessageAll.where("user_id =? and message_type=?",@user,"MemoMessage").order("created_at desc")
|
|
|
|
|
# @user_feedback_messages = MessageAll.where("user_id =? and message_type=?",@user,"UserFeedbackMessage").order("created_at desc")
|
|
|
|
|
# @user_course_messages_count = @user_course_messages.count
|
|
|
|
|
# @user_forge_messages_count = @user_forge_messages.count
|
|
|
|
|
# @user_memo_messages_count = @user_memo_messages.count
|
|
|
|
|
# @user_feedback_messages_count = @user_feedback_messages.count
|
|
|
|
|
when 'homework'
|
|
|
|
|
@message_alls = CourseMessage.where("course_message_type =? and user_id =?", "HomeworkCommon", @user).order("created_at desc")
|
|
|
|
|
#@user_course_messages_count = @user_course_messages.count
|
|
|
|
|
when 'course_message'
|
|
|
|
|
@message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc")
|
|
|
|
|
#@user_course_messages_count = @user_course_messages.count
|
|
|
|
|
when 'forge_message'
|
|
|
|
|
@message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Message", @user).order("created_at desc")
|
|
|
|
|
#@user_forge_messages_count = @user_forge_messages.count
|
|
|
|
|
when 'course_news'
|
|
|
|
|
@message_alls = CourseMessage.where("course_message_type =? and user_id =?", "News", @user).order("created_at desc")
|
|
|
|
|
#@user_course_messages_count = @user_course_messages.count
|
|
|
|
|
when 'forge_news'
|
|
|
|
|
@message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "News", @user).order("created_at desc")
|
|
|
|
|
#@user_forge_messages_count = @user_forge_messages.count
|
|
|
|
|
when 'course_news_reply'
|
|
|
|
|
@message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
|
|
|
|
|
#@user_course_messages_count = @user_course_messages.count
|
|
|
|
|
when 'forge_news_reply'
|
|
|
|
|
@message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
|
|
|
|
|
#@user_forge_messagess_count = @user_forge_messages.count
|
|
|
|
|
when 'poll'
|
|
|
|
|
@message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc")
|
|
|
|
|
#@user_course_messages_count = @user_course_messages.count
|
|
|
|
|
when 'works_reviewers'
|
|
|
|
|
@message_alls = CourseMessage.where("course_message_type =? and user_id =?", "StudentWorksScore", @user).order("created_at desc")
|
|
|
|
|
#@user_course_messages_count = @user_course_messages.count
|
|
|
|
|
when 'works_reply'
|
|
|
|
|
@message_alls = CourseMessage.where("course_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc")
|
|
|
|
|
#@user_course_messages_count = @user_course_messages.count
|
|
|
|
|
when 'issue'
|
|
|
|
|
@message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Issue", @user).order("created_at desc")
|
|
|
|
|
#@user_forge_messages_count = @user_forge_messages.count
|
|
|
|
|
when 'issue_update' # 缺陷状态更新、留言
|
|
|
|
|
@message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Journal", @user).order("created_at desc")
|
|
|
|
|
#@user_forge_messages_count = @user_forge_messages.count
|
|
|
|
|
when 'forum'
|
|
|
|
|
@message_alls = MemoMessage.where("memo_type =? and user_id =?", "Memo", @user).order("created_at desc")
|
|
|
|
|
#@user_memo_messages_count = @user_memo_messages.count
|
|
|
|
|
when 'user_feedback'
|
|
|
|
|
@message_alls = UserFeedbackMessage.where("journals_for_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc")
|
|
|
|
|
#@user_feedback_messages_count = @user_feedback_messages.count
|
|
|
|
|
else
|
|
|
|
|
render_404
|
|
|
|
|
return
|
|
|
|
|
end
|
|
|
|
|
respond_to do |format|
|
|
|
|
|
format.html{render :layout=>'new_base_user'}
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def user_projects_index
|
|
|
|
|
if User.current.admin?
|
|
|
|
|
memberships = @user.memberships.all(conditions: "projects.project_type = #{Project::ProjectType_project}").first
|
|
|
|
|
|
