From 73acb558cc4c8a400b5964050671df022e51e076 Mon Sep 17 00:00:00 2001
From: Ken Rice <krice@freeswitch.org>
Date: Fri, 25 Sep 2015 17:56:39 -0500
Subject: [PATCH] FS-8224 Allow CallerID to be set from login settings in VC

If CallerID is not set as is the default case with using VC on cantina
default to using the users email address.
---
 html5/verto/verto_communicator/src/partials/login.html       | 5 +++++
 .../verto_communicator/src/partials/modal_logininfo.html     | 4 ++++
 .../src/vertoService/services/vertoService.js                | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/html5/verto/verto_communicator/src/partials/login.html b/html5/verto/verto_communicator/src/partials/login.html
index 5a0c03c7dd..1d20188885 100644
--- a/html5/verto/verto_communicator/src/partials/login.html
+++ b/html5/verto/verto_communicator/src/partials/login.html
@@ -28,6 +28,11 @@
             <input type="password" class="form-control" id="login-password" placeholder="Password" ng-model="verto.data.password">
           </div>
 
+          <div class="form-group" ng-hide="!advanced">
+            <label class="control-label" for="login-callerid">Caller ID</label>
+            <input type="text" class="form-control" id="login-callerid" placeholder="Caller ID" ng-model="verto.data.callerid">
+          </div>
+
           <div class="form-group" ng-hide="!advanced">
             <label class="control-label" for="login-hostname">Hostname</label>
             <input type="text" class="form-control" id="login-hostname" placeholder="Hostname" ng-model="verto.data.hostname">
diff --git a/html5/verto/verto_communicator/src/partials/modal_logininfo.html b/html5/verto/verto_communicator/src/partials/modal_logininfo.html
index e41eef4de1..4a6d7075c5 100644
--- a/html5/verto/verto_communicator/src/partials/modal_logininfo.html
+++ b/html5/verto/verto_communicator/src/partials/modal_logininfo.html
@@ -23,6 +23,10 @@
     <input type="password" class="form-control" id="password" placeholder="Password" ng-model="verto.data.password">
   </div>
 
+  <div class="form-group">
+    <label class="control-label" for="callerid">Caller ID</label>
+    <input type="password" class="form-control" id="callerid" placeholder="Caller ID" ng-model="verto.data.callerid">
+  </div>
 
 </div>
 <div class="modal-footer">
diff --git a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
index e65d2f68f4..1437bb37ea 100644
--- a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
+++ b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
@@ -631,7 +631,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
         var call = data.instance.newCall({
           destination_number: destination,
           caller_id_name: data.name,
-          caller_id_number: data.login,
+          caller_id_number: data.callerid ? data.callerid : data.email,
           outgoingBandwidth: storage.data.outgoingBandwidth,
           incomingBandwidth: storage.data.incomingBandwidth,
           useVideo: storage.data.useVideo,