diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ba7d97202..8e4d9e42e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -503,9 +503,9 @@ class UsersController < ApplicationController
# 初始化/更新 点击按钮时间, 24小时内显示系统消息
update_onclick_time
# 全部设为已读
- # if params[:viewed] == "all"
+ # if params[:viewed] == "all"
# update_message_viewed(@user)
- # end
+ # end
# @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count
courses = @user.courses.where("is_delete = 1")
course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
@@ -587,24 +587,24 @@ class UsersController < ApplicationController
# 消息设置为已读
def update_message_viewed
if User.current.id == @user.id
- course_querys = CourseMessage.where("user_id =? and viewed =?", @user.id, 0)
- forge_querys = ForgeMessage.where("user_id =? and viewed =?", @user.id, 0)
- user_querys = UserFeedbackMessage.where("user_id =? and viewed =?", @user.id, 0)
- forum_querys = MemoMessage.where("user_id =? and viewed =?", @user.id, 0)
- org_querys = OrgMessage.where("user_id=? and viewed=0", @user.id)
- at_querys = AtMessage.where("user_id=? and viewed=0", @user.id)
- contest_querys = ContestMessage.where(:user_id => @user.id, :viewed => 0)
- blog_querys = BlogMessage.where(:user_id => @user.id, :viewed => 0)
- applied_querys = AppliedMessage.where("user_id=? and viewed =?", @user.id, 0)
- course_querys.update_all(:viewed => true) unless course_querys.nil?
- forge_querys.update_all(:viewed => true) unless forge_querys.nil?
- user_querys.update_all(:viewed => true) unless user_querys.nil?
- forum_querys.update_all(:viewed => true) unless forum_querys.nil?
- org_querys.update_all(:viewed => true) unless org_querys.nil?
- at_querys.update_all(:viewed => true) unless at_querys.nil?
- contest_querys.update_all(:viewed => true) unless contest_querys.nil?
- blog_querys.update_all(:viewed => true) unless blog_querys.nil?
- applied_querys.update_all(:viewed => true) unless applied_querys.nil?
+ course_querys = CourseMessage.where("user_id =? and viewed =?", @user.id, 0)
+ forge_querys = ForgeMessage.where("user_id =? and viewed =?", @user.id, 0)
+ user_querys = UserFeedbackMessage.where("user_id =? and viewed =?", @user.id, 0)
+ forum_querys = MemoMessage.where("user_id =? and viewed =?", @user.id, 0)
+ org_querys = OrgMessage.where("user_id=? and viewed=0", @user.id)
+ at_querys = AtMessage.where("user_id=? and viewed=0", @user.id)
+ contest_querys = ContestMessage.where(:user_id => @user.id, :viewed => 0)
+ blog_querys = BlogMessage.where(:user_id => @user.id, :viewed => 0)
+ applied_querys = AppliedMessage.where("user_id=? and viewed =?", @user.id, 0)
+ course_querys.update_all(:viewed => true) unless course_querys.nil?
+ forge_querys.update_all(:viewed => true) unless forge_querys.nil?
+ user_querys.update_all(:viewed => true) unless user_querys.nil?
+ forum_querys.update_all(:viewed => true) unless forum_querys.nil?
+ org_querys.update_all(:viewed => true) unless org_querys.nil?
+ at_querys.update_all(:viewed => true) unless at_querys.nil?
+ contest_querys.update_all(:viewed => true) unless contest_querys.nil?
+ blog_querys.update_all(:viewed => true) unless blog_querys.nil?
+ applied_querys.update_all(:viewed => true) unless applied_querys.nil?
end
redirect_to user_path(@user)
end
@@ -2041,22 +2041,9 @@ class UsersController < ApplicationController
id = ids + ids2
id = id.uniq
=end
- # 这部分代码还需要优化
- id_new = Shixun.find_by_sql("select id from shixuns where id in (select shixun_id from myshixuns where user_id = #{@user.id})")
- ids_new = Shixun.find_by_sql("select shixun_id from shixun_members where user_id=#{@user.id}")
- ids2 = ids_new.map{|shixun| shixun.shixun_id} unless ids_new.blank?
- # 我创建的id
- create_id_new = Shixun.where(:user_id => @user).pluck(:id)
- id2 = ids2 - create_id_new
if @user == User.current
- @challenge_count = Shixun.where(:id => id_new).count
- @create_count = Shixun.where(:user_id => @user).count
- @cooperative_count = @shixuns = Shixun.where(:id => id2).count
@shixuns = Shixun.where(:user_id => @user).order("created_at desc")
else
- @challenge_count = Shixun.where(:status => [2, 3], :id => id_new).count
- @create_count = Shixun.where(:status => [2, 3], :user_id => @user).count
- @cooperative_count = Shixun.where(:status => [2, 3], :id => id2).count
@shixuns = Shixun.where(:status => [2, 3], :user_id => @user).order("created_at desc")
end
@limit = 5
@@ -2267,10 +2254,7 @@ class UsersController < ApplicationController
def user_show_course_list
- @courses = @user.courses.not_deleted_not_end.order("updated_at desc")
- @courses_manage_count = @user.courses.not_deleted_not_end.where(:tea_id => @user.id).count
- @courses_join_count = @user.courses.not_deleted_not_end.where("tea_id != #{@user.id}").count
-
+ @courses = @user.courses.not_deleted_not_end.where(:tea_id => @user.id).order("updated_at desc")
@courses_count = @courses.count
@limit = 5
@is_remote = true
@@ -4507,7 +4491,7 @@ class UsersController < ApplicationController
private
def show_system_message
- # 系统消息总显示在最前面,显示周期30天
+ # 系统消息总显示在最前面,显示周期30天
@system_messages = SystemMessage.where("created_at > ?", Time.now - 86400 * 30)
end
diff --git a/app/views/users/_my_homepage_course_show.html.erb b/app/views/users/_my_homepage_course_show.html.erb
index 69aca8a58..d7de61b32 100644
--- a/app/views/users/_my_homepage_course_show.html.erb
+++ b/app/views/users/_my_homepage_course_show.html.erb
@@ -6,9 +6,9 @@
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 55a1ada3d..8af3b8846 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -233,10 +233,10 @@