Show transfer buttons only for switchable incoming calls.

3 files changed, 8 insertions, 7 deletions

diff --git a/app/models/switchboard.rb b/app/models/switchboard.rb
index 73219e8..d62657f 100644
--- a/app/models/switchboard.rb
+++ b/app/models/switchboard.rb
@@ -25,7 +25,7 @@ class Switchboard < ActiveRecord::Base
                              }
 
   belongs_to :user, :touch => true
-  
+
   has_many :switchboard_entries, :dependent => :destroy
   has_many :switchable_switchboard_entries, :class_name => "SwitchboardEntry", :conditions => {:switchable => true}
 
@@ -41,11 +41,11 @@ class Switchboard < ActiveRecord::Base
   end
 
   def active_calls
-    Call.where("sip_account_id = ? or b_sip_account_id = ?", self.switchable_sip_account_ids, self.switchable_sip_account_ids)
+    Call.where("sip_account_id = ? or b_sip_account_id = ?", self.switchable_sip_account_ids, self.switchable_sip_account_ids).order(:start_stamp)
   end
 
   def dispatchable_incoming_calls
-    Call.where("b_sip_account_id = ?", self.switchable_sip_account_ids)
+    Call.where("b_sip_account_id = ?", self.switchable_sip_account_ids).order(:start_stamp)
   end
 
   private
diff --git a/app/serializers/switchboard_serializer.rb b/app/serializers/switchboard_serializer.rb
index 6d39667..7c21f82 100644
--- a/app/serializers/switchboard_serializer.rb
+++ b/app/serializers/switchboard_serializer.rb
@@ -6,4 +6,5 @@ class SwitchboardSerializer < ActiveModel::Serializer
   has_many :sip_accounts, :through => :switchboard_entries
   has_many :phone_numbers
   has_many :active_calls
+  has_many :dispatchable_incoming_calls
 end
diff --git a/app/views/switchboards/show.html.erb b/app/views/switchboards/show.html.erb
index f3304cf..69b0ed6 100644
--- a/app/views/switchboards/show.html.erb
+++ b/app/views/switchboards/show.html.erb
@@ -46,11 +46,11 @@
                       {{phoneNumber.number}}
                     </span>
 
-                    {{#if activeCalls.length}}
+                    {{#if dispatchableIncomingCalls.length}}
                       <p>
-                        {{#each activeCall in activeCalls}}
-                          <button {{action transfer_blind activeCall.id phoneNumber.number}} class="btn btn-small">Transfer</button>
-                          <button {{action transfer_attended activeCall.id phoneNumber.number}} class="btn btn-small">Attended Transfer</button>
+                        {{#each dispatchableIncomingCall in dispatchableIncomingCalls}}
+                          <button {{action transfer_blind dispatchableIncomingCall.id phoneNumber.number}} class="btn btn-small">Transfer</button>
+                          <button {{action transfer_attended dispatchableIncomingCall.id phoneNumber.number}} class="btn btn-small">Attended Transfer</button>
                         {{/each}}
                       </p>
                     {{/if}}