diff --git a/src/app/settings/settingsDomainsController.js b/src/app/settings/settingsDomainsController.js index 6a0b5f42..9a3e1385 100644 --- a/src/app/settings/settingsDomainsController.js +++ b/src/app/settings/settingsDomainsController.js @@ -15,25 +15,12 @@ } if (response.GlobalEquivalentDomains) { - for (var globalDomain in response.GlobalEquivalentDomains) { - if (response.GlobalEquivalentDomains.hasOwnProperty(globalDomain)) { - var domain = { - values: response.GlobalEquivalentDomains[globalDomain], - excluded: false, - key: globalDomain - }; - - if (response.ExcludedGlobalEquivalentDomains) { - for (i = 0; i < response.ExcludedGlobalEquivalentDomains.length; i++) { - if (response.ExcludedGlobalEquivalentDomains[i] === globalDomain) { - domain.excluded = true; - break; - } - } - } - - $scope.globalEquivalentDomains.push(domain); - } + for (i = 0; i < response.GlobalEquivalentDomains.length; i++) { + $scope.globalEquivalentDomains.push({ + domains: response.GlobalEquivalentDomains[i].Domains.join(', '), + excluded: response.GlobalEquivalentDomains[i].Excluded, + key: response.GlobalEquivalentDomains[i].Type + }); } } }); @@ -44,7 +31,7 @@ $scope.customize = function (globalDomain) { globalDomain.excluded = true; - $scope.equivalentDomains.push(globalDomain.values.join(', ')); + $scope.equivalentDomains.push(globalDomain.domains); } $scope.delete = function (i) { diff --git a/src/app/settings/views/settingsDomains.html b/src/app/settings/views/settingsDomains.html index e978545f..47418acc 100644 --- a/src/app/settings/views/settingsDomains.html +++ b/src/app/settings/views/settingsDomains.html @@ -31,7 +31,7 @@ -