aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordom1nga2011-12-06 23:17:29 +0200
committerdom1nga2011-12-06 23:17:29 +0200
commit213bdca3bbbab2a1a374a5f3403b04c79be50206 (patch)
tree8be3d4ee91678c2209cbaf14693547e27588353f
parent517490fce2c9703619a317e7d261479b7a129982 (diff)
downloadinboxes-213bdca3bbbab2a1a374a5f3403b04c79be50206.tar.bz2
Removed duplicated calling to discussion.users.
-rw-r--r--app/models/discussion.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/discussion.rb b/app/models/discussion.rb
index d6b7731..955e518 100644
--- a/app/models/discussion.rb
+++ b/app/models/discussion.rb
@@ -67,7 +67,7 @@ class Discussion < ActiveRecord::Base
discussions = self.joins(:speakers).includes(:users).where("speakers.user_id = ?", user.id)
Rails.logger.info "Searching for ids: #{user.id}, #{user2.id}"
discussions.each do |discussion|
- dialog = discussion if discussion.private? && ((discussion.users.first == user && discussion.users.last == user2) || (discussion.users.first == user2 && discussion.users.last == user))
+ dialog = discussion if discussion.private? && ([discussion.users.first, discussion.users.last] - [user, user2]).length.zero?
end
dialog
end