diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-27 20:53:10 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-27 20:53:10 +0100 |
| commit | 46eb56627a0d1f5142b79b476bbeb96f91a157d9 (patch) | |
| tree | 0bdd9939964491576087d8d8a653e26543bf704a /app/models/sip_account.rb | |
| parent | 67c1a0a951403a546250ea860a3e3d199cae2fce (diff) | |
| parent | ef2acbfebeefdd17f8896a3e5eb44775febf4dee (diff) | |
Merge branch 'develop'5.1-beta7
Diffstat (limited to 'app/models/sip_account.rb')
| -rw-r--r-- | app/models/sip_account.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/sip_account.rb b/app/models/sip_account.rb index 2040b41..5660e37 100644 --- a/app/models/sip_account.rb +++ b/app/models/sip_account.rb @@ -38,7 +38,7 @@ class SipAccount < ActiveRecord::Base has_many :ringtones, :as => :ringtoneable, :dependent => :destroy - has_many :calls, :finder_sql => lambda { |s| "SELECT DISTINCT detailed_calls.* FROM detailed_calls WHERE presence_id LIKE '#{self.auth_name}@%'" } + has_many :calls, :finder_sql => lambda { |s| "SELECT DISTINCT detailed_calls.* FROM detailed_calls WHERE presence_id LIKE '#{self.auth_name}@%' OR b_presence_id LIKE '#{self.auth_name}@%'" } # Delegations: # |