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.

diff --git a/html5/verto/verto_communicator/src/partials/login.html b/html5/verto/verto_communicator/src/partials/login.html
index 5a0c03c7ddd5d11c245945dc67b1850741762312..1d201888854ff663fbba2f5f77dfd3a528caaa23 100644 (file)
--- 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 e41eef4de1cebaac35ffef89b7b5b54f65b993fc..4a6d7075c50f3264ae6b2b43d978518f100ce9ed 100644 (file)
--- 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 e65d2f68f498b8b6ed1ca48ef00525584da05150..1437bb37ea88cecbf87ad028965cb589d481a216 100644 (file)
--- 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,