@ -82,6 +82,7 @@ class UsersController < ApplicationController
# fq
helper:words
helper:project_score
helper:issues
includeUsersHelper
defrefresh_changests
@ -587,11 +588,21 @@ class UsersController < ApplicationController
user_ids<<@user.id
end
query=Activity.where(user_id:user_ids)
query=Activity.joins("join courses c on c.id=#{Activity.table_name}.activity_container_id and #{Activity.table_name}.activity_container_type='Course'")
query=query.where("#{Activity.table_name}.user_id in (?)",user_ids)
@ -611,11 +622,16 @@ class UsersController < ApplicationController
user_ids<<@user.id
end
query=Activity.where(user_id:user_ids)
query=Activity.joins("join projects c on c.id=#{Activity.table_name}.activity_container_id and #{Activity.table_name}.activity_container_type='Project'")