From 68b4b92d9607d9428e635e7017890f49421a633b Mon Sep 17 00:00:00 2001 From: Jean-Roch Maitre Date: Mon, 7 Nov 2016 08:42:23 -0800 Subject: [PATCH] UI-2456: features available doesn't include the activated features, so we change some code to reflect that --- submodules/myOffice/myOffice.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/submodules/myOffice/myOffice.js b/submodules/myOffice/myOffice.js index f2f2527..e89fb76 100644 --- a/submodules/myOffice/myOffice.js +++ b/submodules/myOffice/myOffice.js @@ -859,8 +859,10 @@ define(function(require){ if(number) { self.myOfficeGetNumber(number, function(numberData) { var availableFeatures = numberData.hasOwnProperty('_read_only') && numberData._read_only.hasOwnProperty('features_available') ? numberData._read_only.features_available : [], - hasE911 = availableFeatures.indexOf('e911') >= 0, - hasCNAM = availableFeatures.indexOf('cnam') >= 0; + activatedFeatures = numberData.hasOwnProperty('_read_only') && numberData._read_only.hasOwnProperty('features') ? numberData._read_only.features : [], + allFeatures = availableFeatures.concat(activatedFeatures), + hasE911 = allFeatures.indexOf('e911') >= 0, + hasCNAM = allFeatures.indexOf('cnam') >= 0; if(hasE911) { if (monster.util.isNumberFeatureEnabled('e911')) {