From dae10494be0ab8af5b82b8e47f0d0ac8605e9e55 Mon Sep 17 00:00:00 2001 From: Joris Tirado Date: Fri, 12 Oct 2018 15:10:58 -0700 Subject: [PATCH] UI-3170: Enforce e911 feature check for device popup dropdown menu (#88) * Clean up device popup menu section * Enforce e911 feature check for "Emergency Caller-ID" --- submodules/devices/devices.js | 2 +- submodules/devices/views/devices-ata.html | 32 ++++++++-- .../devices/views/devices-cellphone.html | 14 +++- submodules/devices/views/devices-fax.html | 32 ++++++++-- .../devices/views/devices-landline.html | 24 ++++--- submodules/devices/views/devices-mobile.html | 44 ++++++++++--- .../devices/views/devices-sip_device.html | 64 +++++++++++++++---- submodules/devices/views/devices-sip_uri.html | 14 +++- .../devices/views/devices-smartphone.html | 44 +++++++++++-- .../devices/views/devices-softphone.html | 46 ++++++++++--- 10 files changed, 250 insertions(+), 66 deletions(-) diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js index d9d203b..096a9b0 100644 --- a/submodules/devices/devices.js +++ b/submodules/devices/devices.js @@ -331,7 +331,7 @@ define(function(require) { name: 'devices-' + type, data: $.extend(true, {}, data, { isProvisionerConfigured: monster.config.api.hasOwnProperty('provisioner'), - showEmergencyCnam: monster.util.isNumberFeatureEnabled('cnam') && monster.util.isNumberFeatureEnabled('e911') + showEmergencyCallerId: monster.util.isNumberFeatureEnabled('e911') }), submodule: 'devices' })), diff --git a/submodules/devices/views/devices-ata.html b/submodules/devices/views/devices-ata.html index e86ee74..ac0ffa8 100644 --- a/submodules/devices/views/devices-ata.html +++ b/submodules/devices/views/devices-ata.html @@ -14,18 +14,36 @@ diff --git a/submodules/devices/views/devices-cellphone.html b/submodules/devices/views/devices-cellphone.html index 20ae0f3..c6cbad8 100644 --- a/submodules/devices/views/devices-cellphone.html +++ b/submodules/devices/views/devices-cellphone.html @@ -14,14 +14,22 @@ diff --git a/submodules/devices/views/devices-fax.html b/submodules/devices/views/devices-fax.html index 83a0677..aecacd2 100644 --- a/submodules/devices/views/devices-fax.html +++ b/submodules/devices/views/devices-fax.html @@ -14,18 +14,36 @@ diff --git a/submodules/devices/views/devices-landline.html b/submodules/devices/views/devices-landline.html index 5645a59..ecddf8c 100644 --- a/submodules/devices/views/devices-landline.html +++ b/submodules/devices/views/devices-landline.html @@ -14,16 +14,24 @@ diff --git a/submodules/devices/views/devices-mobile.html b/submodules/devices/views/devices-mobile.html index c8bed8e..c19237f 100644 --- a/submodules/devices/views/devices-mobile.html +++ b/submodules/devices/views/devices-mobile.html @@ -14,23 +14,51 @@