talk: Fix caller ID when initiating call from webapp

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/webapp/backend/asterisk.py b/webapp/backend/asterisk.py
index 8f382579de83f9eed29397f9a5f6f3d851e4ee97..34479e5cf0709f648f063525e9333f856ef20954 100644 (file)
--- a/webapp/backend/asterisk.py
+++ b/webapp/backend/asterisk.py
@@ -107,14 +107,14 @@ class AsteriskManager(object):
 
                 return res["Ping"] == "Pong"
 
-        def call(self, caller, callee, callee_id=None, timeout=30000):
+        def call(self, caller, callee, caller_id=None, timeout=30000):
                 res = self._send_action("Originate", {
                         "Channel"  : "SIP/%s@kamailio" % caller,
                         "Exten"    : callee,
                         "Context"  : "from-cli",
                         "Priority" : 1,
                         "Timeout"  : timeout,
-                        "CallerID" : callee_id or callee,
+                        "CallerID" : caller_id or caller,
                 })
 
                 return res

diff --git a/webapp/backend/talk.py b/webapp/backend/talk.py
index a029c37168b721c0dd5dd8d2a96deeb18481a33b..79520715b1e09096980743e9a64d304228c001eb 100644 (file)
--- a/webapp/backend/talk.py
+++ b/webapp/backend/talk.py
@@ -181,10 +181,11 @@ class Talk(Object):
 
                return self._process_cdr(res, replace_sip_uris=True)
 
-       def initiate_call(self, caller, callee, callee_id=None):
+       def initiate_call(self, caller, callee):
                 a = self.connect_to_asterisk()
 
-                return a.call(caller, callee, callee_id=callee_id)
+                return a.call(caller.sip_id, callee,
+                        caller_id="%s <%s>" % (caller.name, caller.sip_id))
 
        # Favourites
 

diff --git a/webapp/handlers_talk.py b/webapp/handlers_talk.py
index efb0307e2afe42d52e440806d06a1a10d46c7c82..f990aa88b3cd04143de5df0cd4532d35d0332e95 100644 (file)
--- a/webapp/handlers_talk.py
+++ b/webapp/handlers_talk.py
@@ -73,7 +73,7 @@ class TalkInitiateCallHandler(BaseHandler):
 
                called = self.accounts.get_by_sip_id(called_id)
 
-               self.talk.initiate_call(self.current_user.sip_id, called_id)
+               self.talk.initiate_call(self.current_user, called_id)
 
                next = self.get_argument("next", None)
                if next is None: