Merge branch 'develop'5.1.1

1 files changed, 20 insertions, 4 deletions

diff --git a/app/controllers/calls_controller.rb b/app/controllers/calls_controller.rb
index 5534b1b..9d85a10 100644
--- a/app/controllers/calls_controller.rb
+++ b/app/controllers/calls_controller.rb
@@ -3,6 +3,7 @@ class CallsController < ApplicationController
   load_resource :call
 
   before_filter :set_and_authorize_parent
+  before_filter :spread_breadcrumbs
   
   def index
     if @parent
@@ -17,11 +18,11 @@ class CallsController < ApplicationController
       protocol, separator, phone_number = params[:url].partition(':')
       if ! phone_number.blank? 
         @call = @parent.calls.new()
-        @call.dest = phone_number
+        @call.destination = phone_number
       end
     elsif !params[:number].blank?
       @call = @parent.calls.new()
-      @call.dest = params[:number]
+      @call.destination = params[:number]
     end
   end
 
@@ -30,8 +31,7 @@ class CallsController < ApplicationController
   end
 
   def create
-    params[:call][:sip_account] = @sip_account
-    @call = Call.create(params[:call])
+    @call = @sip_account.calls.create(params[:call])
 
     if @call && @call.call
       m = method( :"#{@parent.class.name.underscore}_calls_url" )
@@ -55,4 +55,20 @@ class CallsController < ApplicationController
   def set_and_authorize_parent
     @parent = @sip_account
   end
+
+  def spread_breadcrumbs
+    if @parent.class == SipAccount
+      if @sip_account.sip_accountable.class == User
+        add_breadcrumb t('users.name'), tenant_users_path(@sip_account.sip_accountable.current_tenant) 
+        add_breadcrumb @sip_account.sip_accountable, tenant_user_path(@sip_account.sip_accountable.current_tenant, @sip_account.sip_accountable) 
+        add_breadcrumb t('sip_accounts.index.page_title'), user_sip_accounts_path(@sip_account.sip_accountable) 
+        add_breadcrumb @sip_account, user_sip_account_path(@sip_account.sip_accountable, @sip_account) 
+        add_breadcrumb t('calls.index.page_title'), sip_account_calls_path(@sip_account) 
+      elsif @sip_account.sip_accountable.class == Tenant
+        add_breadcrumb t('sip_accounts.index.page_title'), tenant_sip_accounts_path(@sip_account.sip_accountable) 
+        add_breadcrumb @sip_account, tenant_sip_account_path(@sip_account.sip_accountable, @sip_account) 
+        add_breadcrumb t('calls.index.page_title'), sip_account_calls_path(@sip_account) 
+      end
+    end
+  end
 end