From c98072557273ff4383013f73621061ece34fc6d2 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Thu, 7 Mar 2013 02:36:38 -0500
Subject: call model table changed

---
 app/models/call.rb                    |  2 +-
 app/models/sip_account.rb             |  2 +-
 app/views/calls/_form_core.html.haml  |  2 +-
 app/views/calls/_index_core.html.haml | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'app')

diff --git a/app/models/call.rb b/app/models/call.rb
index db6d9d6..b0cd9b2 100644
--- a/app/models/call.rb
+++ b/app/models/call.rb
@@ -1,5 +1,5 @@
 class Call < ActiveRecord::Base
-  self.table_name = 'detailed_calls'
+  self.table_name = 'calls_active'
   self.primary_key = 'uuid'
 
   attr_writer :sip_account_id
diff --git a/app/models/sip_account.rb b/app/models/sip_account.rb
index 1499d62..81b9c1c 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}@%' OR b_presence_id LIKE '#{self.auth_name}@%'" }
+  has_many :calls, :finder_sql => lambda { |s| "SELECT DISTINCT calls_active.* FROM calls_active WHERE sip_account_id = #{self.id} OR b_sip_account_id = #{self.id}" }
 
   # Delegations:
   #
diff --git a/app/views/calls/_form_core.html.haml b/app/views/calls/_form_core.html.haml
index 4cdd55e..ec795f2 100644
--- a/app/views/calls/_form_core.html.haml
+++ b/app/views/calls/_form_core.html.haml
@@ -1,2 +1,2 @@
 .inputs
-  = f.input :dest, :as => :string, :label => t('calls.form.destination.label'), :hint => conditional_hint('calls.form.destination.hint'), :autofocus => true
+  = f.input :destination, :as => :string, :label => t('calls.form.destination.label'), :hint => conditional_hint('calls.form.destination.hint'), :autofocus => true
diff --git a/app/views/calls/_index_core.html.haml b/app/views/calls/_index_core.html.haml
index e5b769e..5ed5538 100644
--- a/app/views/calls/_index_core.html.haml
+++ b/app/views/calls/_index_core.html.haml
@@ -19,17 +19,17 @@
           - else
             %i.icon-arrow-right
         %td
-          = call.created
+          = l Time.at(call.start_stamp), :format => :short
         %td
-          = call.dest
+          = call.destination
         %td
-          = "#{call.cid_name} #{call.cid_num}"
+          = "#{call.caller_id_name} #{call.caller_id_number}"
         %td
-          = "#{call.callee_name} #{call.callee_num}"
+          = "#{call.callee_name} #{call.callee_number}"
         %td
           = call.callstate
         %td
-          = "#{call.read_codec}/#{call.write_codec}"
+          = "#{call.read_codec}/#{call.read_rate}:#{call.write_codec}/#{call.write_rate}"
 
         %td
           %p
-- 
cgit v1.2.3