aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKir Shatrov2011-12-07 12:08:52 -0800
committerKir Shatrov2011-12-07 12:08:52 -0800
commit864dea35f81820d7b1478979a1861c301ba11285 (patch)
treee16918c2dbc0e56b284900e9f9a94a425ddbbdf2
parent517490fce2c9703619a317e7d261479b7a129982 (diff)
parent8b4c352ef05805c583e0396ce86222244a5a1ada (diff)
downloadinboxes-864dea35f81820d7b1478979a1861c301ba11285.tar.bz2
Merge pull request #5 from dom1nga/find_between_users_refactoring
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..a4ad82b 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]).empty?
end
dialog
end