Merge branch 'szzh' into guange_dev
This commit is contained in:
commit
0c4f88ca29
|
@ -445,15 +445,15 @@ class UsersController < ApplicationController
|
||||||
else
|
else
|
||||||
activity = Activity.where(where_condition).where('user_id = ?', @user.id).order('id desc')
|
activity = Activity.where(where_condition).where('user_id = ?', @user.id).order('id desc')
|
||||||
end
|
end
|
||||||
activity = activity.reject { |e|
|
# activity = activity.reject { |e|
|
||||||
e.act.nil? ||
|
# e.act.nil? ||
|
||||||
(!User.current.admin? && !e.act.nil?
|
# (!User.current.admin? && !e.act.nil?
|
||||||
(((e.act_type == "Issue") && !e.act.project.visible?(User.current)) ||
|
# (((e.act_type == "Issue") && !e.act.project.visible?(User.current)) ||
|
||||||
(e.act_type == "Bid" && !e.act.courses.first.nil? && e.act.courses.first.is_public == 0 && !User.current.member_of_course?(e.act.courses.first)) ||
|
# (e.act_type == "Bid" && !e.act.courses.first.nil? && e.act.courses.first.is_public == 0 && !User.current.member_of_course?(e.act.courses.first)) ||
|
||||||
(e.act_type == "Journal" && e.act.respond_to?("Project") && !e.act.project.visible?(User.current)) ||
|
# (e.act_type == "Journal" && e.act.respond_to?("Project") && !e.act.project.visible?(User.current)) ||
|
||||||
(e.act_type == "News" && ((!e.act.project.nil? && !e.act.project.visible?(User.current)) || (!e.act.course.nil? && e.act.course.is_public == 0 && !User.current.member_of_course?(e.act.course)))) ||
|
# (e.act_type == "News" && ((!e.act.project.nil? && !e.act.project.visible?(User.current)) || (!e.act.course.nil? && e.act.course.is_public == 0 && !User.current.member_of_course?(e.act.course)))) ||
|
||||||
(e.act_type == "Message" && !e.act.board.nil? && ((!e.act.board.project.nil? && !e.act.board.project.visible?(User.current)) || (!e.act.board.course.nil? && e.act.board.course.is_public == 0 && !User.current.member_of_course?(e.act.board.course))))))
|
# (e.act_type == "Message" && !e.act.board.nil? && ((!e.act.board.project.nil? && !e.act.board.project.visible?(User.current)) || (!e.act.board.course.nil? && e.act.board.course.is_public == 0 && !User.current.member_of_course?(e.act.board.course))))))
|
||||||
}
|
# }
|
||||||
@activity_count = activity.count
|
@activity_count = activity.count
|
||||||
@activity_pages = Paginator.new @activity_count, pre_count, params['page']
|
@activity_pages = Paginator.new @activity_count, pre_count, params['page']
|
||||||
@activity = activity.slice(@activity_pages.offset,@activity_pages.per_page)
|
@activity = activity.slice(@activity_pages.offset,@activity_pages.per_page)
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 9.5 KiB After Width: | Height: | Size: 8.8 KiB |
Loading…
Reference in New Issue