dev_trainings
daiao 6 years ago
parent 82295eef81
commit f4f0a69873

@ -81,7 +81,6 @@ class ShixunsService
discusses = disscusses.limit(LIMIT).includes(:user, :praise_tread).offset(offset) discusses = disscusses.limit(LIMIT).includes(:user, :praise_tread).offset(offset)
end end
base_data discusses, dis, current_user base_data discusses, dis, current_user
return {:children_list => @children_list, :disscuss_count => disscuss_count} return {:children_list => @children_list, :disscuss_count => disscuss_count}
end end
@ -156,7 +155,7 @@ class ShixunsService
if current_user.admin? if current_user.admin?
Discuss.where(root_id: d.id).includes(:user).reorder("created_at asc") Discuss.where(root_id: d.id).includes(:user).reorder("created_at asc")
else else
Discuss.where("root_id = :root_id and (hidden = :hidden or user_id = :user_id", Discuss.where("root_id = :root_id and (hidden = :hidden or user_id = :user_id)",
{root_id: d.id, hidden: false, user_id: current_user.id}).includes(:user).reorder("created_at asc") {root_id: d.id, hidden: false, user_id: current_user.id}).includes(:user).reorder("created_at asc")
end end

Loading…
Cancel
Save